出运明细

src/views/shipment-details/addShipDetDrawer.vue

@@ -724,10 +724,7 @@ export default {
             }
           }
           for(var i=0; i<newObj.syShippingDetailsItemList.length; i++){
-            debugger
              var rowData = newObj.syShippingDetailsItemList[i];
-              console.log(typeof rowData.customsDeclarationUnitPrice)
-              debugger
               // //判断输入报关单价是否为数字
               // if(isNaN(Number(rowData.customsDeclarationUnitPrice,10)) && rowData.customsDeclarationUnitPrice){
               //   this.$message.error('第'+(i+1)+'行报关单价必须为数字！');

src/views/shipment-details/shipmentList.vue

@@ -92,15 +92,15 @@
     <a-card :bordered="false" style=" marginTop:10px;">
       <div class="table-operator">
         <a-button type="primary" @click.stop="addShipDet" icon="plus">新增</a-button>
-
         <a-button type="primary" icon="download" @click="handleExportXls('发运明细')">导出</a-button>
+        <a-button type="primary" icon="download" @click="submit">提交</a-button>
       </div>
 
       <!-- 子表  :row-key="record => record.id"  :pagination="ipagination-->
       <a-table
         v-if="shipmentListData"
         bordered
-        rowKey="randomId"
+        rowKey="itemIds"
         :columns="shipmentListColumns"
         :data-source="shipmentListData"
         :loading="loading"
@@ -144,11 +144,11 @@
                 <a href="javascript:void(0);" @click="itemNumberElement(record)">维护款号成分</a>
               </a-menu-item>
 
-              <a-menu-item>
+              <!-- <a-menu-item>
                 <a-popconfirm title="确定提交吗?" ok-text="是" cancel-text="否" @confirm="submit(record)">
                   <a href="javascript:void(0);" style="color:green;">提交</a>
                 </a-popconfirm>
-              </a-menu-item>
+              </a-menu-item> -->
 
               <a-menu-item>
                 <a-popconfirm  arrowPointAtCenter title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="handleDelete(record)">
@@ -519,6 +519,8 @@ export default {
         flourOrGarment: '', //类型
         pageNo: '' // 点击的页数
       },
+      selectedRowKeys:[],
+      selectedRows:[],
       timeRange:[],//起始时间
       preDeliveryDate:[],//预发货日期
       pagination: {
@@ -588,12 +590,15 @@ export default {
 
     //  维护款号成分
     itemNumberElement(record) {
+      debugger
       this.$refs.itemNumEleModal.itemNumEleModVis = true
-
       this.$refs.itemNumEleModal.editItemNumber.itemIds = record.itemIds
       this.$refs.itemNumEleModal.editItemNumber.itemNumber = record.itemNumber
       this.$refs.itemNumEleModal.editItemNumber.materialComposition = record.materialComposition
       this.$refs.itemNumEleModal.editItemNumber.isTc = record.isTc
+      if(record.materialComposition !== ''){
+        this.$refs.itemNumEleModal.editItemNumber.materialComposition = record.specificationAndModel
+      }
     },
 
     // 导出
@@ -623,7 +628,6 @@ export default {
     //  编辑
     edit(record) {
       this.$refs.editShipDetDrawer.visible = true
-
       queryByDetails({ id: record.id,itemIds: record.itemIds }).then(res => {
         if (res.success) {
           // console.log('编辑对象', res.result)
@@ -633,7 +637,7 @@ export default {
             item.customsDeclarationUnitPrice = item.salesUnitPrice - item.ymoney
             if(item.manualYarnFlag === 0){
               this.$refs.editShipDetDrawer.manualYarnDisabled = true
-            }else{
+            }else {
               this.$refs.editShipDetDrawer.manualYarnDisabled = false
             }      
           })
@@ -656,15 +660,16 @@ export default {
     },
 
     //  提交
-    submit(record) {
-      console.log('点击id:', record.id)
+    submit() {
+      // console.log('点击id:', record.id)
       this.$nextTick(() => {
-        submitShipment({ id: record.id, type: '1' }).then(res => {
+        submitShipment({ submitListId: this.selectedRowKeys, type: '1' }).then(res => {
           if (res.success) {
-            console.log('提交成功，单据状态改为【已提交】')
-            this.shipmentListData.state = '1'
-            this.getShipmentList() // 渲染 发运明细列表
-            this.$message.success('提交成功')
+            debugger
+            // console.log('提交成功，单据状态改为【已提交】')
+            // this.shipmentListData.state = '1'
+            // this.getShipmentList() // 渲染 发运明细列表
+            // this.$message.success('提交成功')
           }
         })
       })
@@ -764,10 +769,19 @@ export default {
       this.queryParam.itemNumber = ''
       this.queryParam.refer = ''
       this.queryParam.isTc = ''
+      this.selectedRows = []
+      this.selectedRowKeys = []
       this.queryParam.flourOrGarment = '', //类型
       this.shipmentListData = [] // 渲染 发运明细列表
     },
 
+    //选中行
+    onSelectChange(keys,rows){
+      this.selectedRowKeys = keys;
+      this.selectedRows = rows;
+      debugger
+    },
+
     // 分页变化时触发
     handleTableChange(pagination, filters, sorter) {
       this.queryParam.pageNo = pagination.current