liangyan0105 2 роки тому
батько
коміт
c3f5d65511

+ 10 - 1
src/views/shipment-details/editShipDetDrawer.vue

@@ -1,7 +1,13 @@
 <template>
   <!-- 编辑发运明细 -->
   <div id="editShipDetDrawer">
-    <a-drawer title="编辑" width="89%" placement="right" :closable="true" :visible="visible" @close="handleCancel">
+    <a-drawer
+      title="编辑"
+      width="89%"
+      placement="right"
+      :closable="true"
+      :visible="visible"
+      @close="handleCancel">
       <!-- 主表信息 编辑 :rules="validatorRules"-->
       <a-card :bordered="true">
         <div class="table-page-search-wrapper">
@@ -311,13 +317,16 @@
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
+
 import ReferOrderDataModal from '@views/shipment-details/referOrderDataModal.vue'
+
 import { editById } from '@api/document/shipmentList'
 
 export default {
   name: 'EditShipDetDrawer', // 编辑 发运明细 抽屉
   mixins: [JeecgListMixin], //
   components: { JEllipsis, ReferOrderDataModal, moment }, // 参照订单数据 弹框
+
   data() {
     let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
     return {

+ 3 - 1
src/views/shipment-details/itemNumEleModal.vue

@@ -68,17 +68,19 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 
 import { addItemNumEle } from '@api/document/shipmentList'
+
 export default {
   name: 'ItemNumEleModal', // 维护款号成分
   mixins: [JeecgListMixin],
   components: { JEllipsis },
+
   data() {
     return {
       loading: false, // 表格加载
       // orderDataform: this.$form.createForm(this),
       confirmLoading: false,
       itemNumEleModVis: false,
-      editItemNumber: {} // 维护款号成分
+      editItemNumber: {} // 编辑维护款号成分
     }
   },
   // 接收父组件 方法

+ 12 - 14
src/views/shipment-details/shipmentList.vue

@@ -320,6 +320,12 @@ export default {
           dataIndex: 'itemNumber',
           width: 180,
           className: 'replacecolor'
+        },
+         {
+          title: '物料成分',
+          dataIndex: 'materialComposition',
+          width: 180,
+          className: 'replacecolor'
         },
         {
           title: '预发货日期',
@@ -534,20 +540,12 @@ export default {
     //  维护款号成分
     itemNumberElement(record) {
       this.$refs.itemNumEleModal.itemNumEleModVis = true
-      console.log('打开维护款号成分')
-      // queryDeclarationElements({
-      //   inventoryName: record.inventoryName,
-      //   itemNumber: record.itemNumber,
-      //   account: record.account
-      // }).then(res => {
-      //   if (res.success) {
-      //     console.log('维护款号成分数据', res.result)
-          // console.log('申报要素子表数据', res.result.syDeclarationElementsItemList)
-          // this.$refs.declareElementsModal.declareElements = res.result
-          // 子表赋值
-          // this.$refs.declareElementsModal.declareElementsData = res.result.syDeclarationElementsItemList
-        // }
-      // })
+      shipmentQueryById({ id: record.id }).then(res => {
+        if (res.success) {
+          console.log('点击的对象', res.result)
+          this.$refs.itemNumEleModal.editItemNumber = res.result
+        }
+      })
     },
 
     //  详情