完善

src/views/purchase/purchase-order-page/modules/BaseForm.vue

@@ -304,12 +304,6 @@ export default {
           title: '货架号',
           dataIndex: 'storePosition'
         },
-        {
-          title: '物料简述',
-          dataIndex: 'cdefine12',
-          width: 150,
-          scopedSlots: { customRender: 'cdefine12' }
-        },
         {
           title: '单价',
           dataIndex: 'ftaxprice',

src/views/purchase/purchase-order-page/modules/Detail.vue

@@ -9,12 +9,20 @@
   >
     <detail-list title="" :col="2">
       <detail-list-item term="计划类型">{{ BaseTool.Object.getField(typeMap,model.type) }}</detail-list-item>
-      <detail-list-item term="计划备注">{{ model.remark }}</detail-list-item>
+      <detail-list-item term="请购原因">{{ model.cmemo }}</detail-list-item>
+      <detail-list-item term="计划类型">{{ BaseTool.Object.getField(cptcodeMap,model.cptcode) }}</detail-list-item>
+      <detail-list-item term="业务类型">{{ BaseTool.Object.getField(cbustypeMap,model.cbustype) }}</detail-list-item>
+      <detail-list-item term="采购厂区">{{ BaseTool.Object.getField(flagMap,model.oldOrNew) }}</detail-list-item>
+      <detail-list-item term="申请部门">{{ BaseTool.Object.getField(deptMap,model.cdepcode) }}</detail-list-item>
+
       <detail-list-item term="设备位号">{{ model.positionNo }}</detail-list-item>
-      <detail-list-item term="厂区">{{ BaseTool.Object.getField(flagMap,model.oldOrNew) }}</detail-list-item>
       <detail-list-item term="项目">{{ model.complateProjectName }}</detail-list-item>
       <detail-list-item term="申请人">{{ model.createdUserName }}</detail-list-item>
       <detail-list-item term="申请日期">{{ model.updateTime }}</detail-list-item>
+      <detail-list-item term="物资描述">{{ model.cdefine11 }}</detail-list-item>
+
+      <detail-list-item term="物料简述">{{ model.cdefine12 }}</detail-list-item>
+
     </detail-list>
 
     <title-divider title="计划明细" width="120px"></title-divider>
@@ -29,7 +37,7 @@
     <template slot="footer">
       <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
     </template>
-  </a-modal>
+    </detail-list-item></a-modal>
 </template>
 
 <script>
@@ -53,6 +61,9 @@ export default {
       invoiceUrls: [],
       moneyTypeMap: {},
       statusMap: {},
+      cptcodeMap: {},
+      deptMap: {},
+      soMap: {},
       model: {
       },
       columns: [
@@ -123,6 +134,10 @@ export default {
     console.log(this.statusMap)
     this.flagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.PROJECT_NEW_AND_OLD)
     this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.LONG_YAN_PURCHASE_TYPE)
+    this.cptcodeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.LONG_YAN_PURCHASE_ORDER_PLAN_TYPE)
+    this.deptMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YONG_YOU_DEPT)
+    this.cbustypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.LONG_YAN_PURCHASE_BUSINESS_TYPE)
+    this.soMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SO_TYPE)
   },
   methods: {
     base (record) {