完善

src/views/sb/scraps/modules/DetailAudit.vue

@@ -45,8 +45,8 @@
     </detail-list>
     <detail-list v-show="storeInfo" title="" :col="2">
       <detail-list-item term="单号">{{ model.outNo }}</detail-list-item>
-      <detail-list-item term="成本归属">{{ model.feeFrom }}</detail-list-item>
-      <detail-list-item term="项目名称">{{ model.projectName }}</detail-list-item>
+      <detail-list-item term="成本归属">{{ model.projectName }}</detail-list-item>
+      <!-- <detail-list-item term="项目名称">{{ model.projectName }}</detail-list-item> -->
       <detail-list-item term="仓库名称">{{ model.storeName }}</detail-list-item>
     </detail-list>
     <title-divider v-show="storeInfo" title="备件明细" width="90px"></title-divider>

src/views/store/outstoreform/modules/BaseFormYY.vue

@@ -119,7 +119,7 @@
               v-decorator="['userTime', {rules: [{required: true, message: '操作时间不能为空'}]}]" />
           </a-form-item>
         </a-col>
-        <a-col :lg="12" :md="24" :sm="24">
+        <!-- <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="成本归属"
             :labelCol="BaseTool.Constant.labelCol"
@@ -134,7 +134,7 @@
               </a-select-option>
             </a-select>
           </a-form-item>
-        </a-col>
+        </a-col> -->
         <!--        <a-tree-select-->
         <!--          style="width: 100%"-->
         <!--          :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"-->
@@ -146,7 +146,7 @@
         <!--        >-->
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="项目："
+            label="成本归属"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -154,7 +154,7 @@
               style="width: 100%"
               :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
               :treeData="treeData"
-              v-decorator="['projectId', {rules: [{required: true, message: '上层设备类型不能为空'}]}]"
+              v-decorator="['projectId', {rules: [{required: true, message: '成本归属不能为空'}]}]"
               placeholder="请选择"
             >
             </a-tree-select>

src/views/store/outstoreform/modules/DetailYY.vue

@@ -16,7 +16,7 @@
       <detail-list-item term="类型">{{ BaseTool.Object.getField(typeMap,model.type) }}</detail-list-item>
       <detail-list-item term="申请部门">{{ BaseTool.Object.getField(deptYYMap,model.applyDept) }}</detail-list-item>
       <detail-list-item term="仓库">{{ model.storeName }}</detail-list-item>
-      <detail-list-item term="项目">{{ model.projectName }}</detail-list-item>
+      <detail-list-item term="成本归属">{{ model.projectName }}</detail-list-item>
       <detail-list-item term="状态"><badge :text="BaseTool.Object.getField(statusMap,model.status)" :status="statusMap[model.status]"/></detail-list-item>
       <detail-list-item term="是否出库"><badge :text="BaseTool.Object.getField(yesNoMap,model.outFlag)" :status="statusMap[model.status]"/></detail-list-item>
       <detail-list-item term="创建人">{{ model.createdUserName }}</detail-list-item>

src/views/store/outstoreform/modules/TicketForm.vue

@@ -23,18 +23,22 @@
             <td colspan="1" style="text-align:left;">
               {{ type? '领库':'退库' }}单位或个人：{{ model.createdUserName }}
             </td>
+
             <td colspan="3" style="text-align:left;">
-              项目：{{ model.projectName }}
+              用途：{{ model.remark }}
             </td>
             <td colspan="3" style="text-align:left;">
-              成本归属：{{ model.feeFrom }}
+              成本归属：{{ model.projectName }}
             </td>
+            <!-- <td colspan="3" style="text-align:left;">
+              成本归属：{{ model.feeFrom }}
+            </td> -->
           </tr>
-          <tr>
+          <!-- <tr>
             <td colspan="7" style="text-align:left;">
               用途：{{ model.remark }}
             </td>
-          </tr>
+          </tr> -->
           <tr>
             <td colspan="1" style="min-width:210px;">物料编码</td>
             <td colspan="1" style="min-width:120px;">物料名称</td>