增加销售订单与采购订单的关联，优化分批入出库的交互

jshERP-web/src/views/bill/modules/SaleOutModal.vue

@@ -22,7 +22,7 @@
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户" data-step="1" data-title="客户"
                          data-intro="客户必须选择，如果发现需要选择的客户尚未录入，可以在下拉框中点击新增客户进行录入。
                           特别注意，客户如果录入之后在下拉框中不显示，请检查是否给当前用户分配对应的客户权限">
-              <a-select placeholder="选择客户" v-decorator="[ 'organId', validatorRules.organId ]"
+              <a-select placeholder="选择客户" v-decorator="[ 'organId', validatorRules.organId ]" :disabled="!rowCanEdit"
                 :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
                 <div slot="dropdownRender" slot-scope="menu">
                   <v-nodes :vnodes="menu" />
@@ -62,14 +62,14 @@
           :dataSource="materialTable.dataSource"
           :maxHeight="300"
           :rowNumber="false"
-          :rowSelection="true"
-          :actionButton="true"
-          :dragSort="true"
+          :rowSelection="rowCanEdit"
+          :actionButton="rowCanEdit"
+          :dragSort="rowCanEdit"
           @valueChange="onValueChange"
           @added="onAdded"
           @deleted="onDeleted">
           <template #buttonAfter>
-            <a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
+            <a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
               <a-col v-if="scanStatus" :md="6" :sm="24">
                 <a-button @click="scanEnter">扫码录入</a-button>
               </a-col>
@@ -80,7 +80,7 @@
                 <a-button @click="stopScan">收起扫码</a-button>
               </a-col>
             </a-row>
-            <a-row :gutter="24" style="float:left;">
+            <a-row :gutter="24" style="float:left;padding-bottom: 5px;">
               <a-col :md="24" :sm="24">
                 <a-dropdown>
                   <a-menu slot="overlay">
@@ -229,6 +229,7 @@
         operTimeStr: '',
         prefixNo: 'XSCK',
         fileList:[],
+        rowCanEdit: true,
         model: {},
         labelCol: {
           xs: { span: 24 },
@@ -304,6 +305,8 @@
     methods: {
       //调用完edit()方法之后会自动调用此方法
       editAfter() {
+        this.rowCanEdit = true
+        this.materialTable.columns[1].type = FormTypes.popupJsh
         this.changeColumnHide()
         this.changeFormTypes(this.materialTable.columns, 'snList', 0)
         this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
@@ -388,68 +391,46 @@
         this.$refs.linkBillList.show('其它', '销售订单', '客户', "1,3")
         this.$refs.linkBillList.title = "选择销售订单"
       },
-      linkBillListOk(selectBillRows) {
+      linkBillListOk(selectBillDetailRows, linkNumber, organId, discount, remark) {
+        this.rowCanEdit = false
+        this.materialTable.columns[1].type = FormTypes.normal
         this.changeFormTypes(this.materialTable.columns, 'preNumber', 1)
         this.changeFormTypes(this.materialTable.columns, 'finishNumber', 1)
-        if(selectBillRows && selectBillRows.length>0) {
-          let record = selectBillRows[0]
-          this.$nextTick(() => {
-            this.form.setFieldsValue({
-              'organId': record.organId,
-              'linkNumber': record.number,
-              'remark': record.remark,
-              'discount': record.discount
-            })
-          });
-          // 加载子表数据
-          let params = {
-            headerId: record.id,
-            mpList: getMpListShort(Vue.ls.get('materialPropertyList'))  //扩展属性
+        if(selectBillDetailRows && selectBillDetailRows.length>0) {
+          let listEx = []
+          let allTaxLastMoney = 0
+          for(let j=0; j<selectBillDetailRows.length; j++) {
+            let info = selectBillDetailRows[j];
+            if(info.finishNumber>0) {
+              info.operNumber = info.preNumber - info.finishNumber
+              info.allPrice = info.operNumber * info.unitPrice-0
+              let taxRate = info.taxRate-0
+              info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0
+              info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0
+            }
+            allTaxLastMoney += info.taxLastMoney
+            listEx.push(info)
+            this.changeColumnShow(info)
+          }
+          this.materialTable.dataSource = listEx
+          ///给优惠后金额重新赋值
+          if(allTaxLastMoney) {
+            let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
+            let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0
+            this.$nextTick(() => {
+              this.form.setFieldsValue({
+                'organId': organId,
+                'linkNumber': linkNumber,
+                'discount': discount,
+                'discountMoney': discountMoney,
+                'discountLastMoney': discountLastMoney,
+                'changeAmount': discountLastMoney,
+                'remark': remark
+              })
+            })
           }
-          this.requestSubTableDataEx(this.url.detailList, params, this.materialTable);
         }
       },
-      /** 查询某个tab的数据,给明细里面的价税合计赋值 */
-      requestSubTableDataEx(url, params, tab, success) {
-        tab.loading = true
-        getAction(url, params).then(res => {
-          if(res && res.code === 200){
-            let list = res.data.rows
-            let listEx = []
-            let allTaxLastMoney = 0
-            for(let j=0; j<list.length; j++){
-              let info = list[j]
-              if(info.finishNumber>0) {
-                info.operNumber = info.preNumber - info.finishNumber
-                info.allPrice = info.operNumber * info.unitPrice-0
-                let taxRate = info.taxRate-0
-                info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0
-                info.taxLastMoney = info.allPrice + info.taxMoney
-              }
-              allTaxLastMoney += info.taxLastMoney
-              listEx.push(info)
-              this.changeColumnShow(info)
-            }
-            tab.dataSource = listEx
-            //给优惠后金额重新赋值
-            if(allTaxLastMoney) {
-              let discount = this.form.getFieldValue('discount')-0
-              let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0
-              let discountLastMoney = allTaxLastMoney - discountMoney
-              this.$nextTick(() => {
-                this.form.setFieldsValue({
-                  'discountMoney': discountMoney,
-                  'discountLastMoney': discountLastMoney,
-                  'changeAmount': discountLastMoney
-                })
-              });
-            }
-            typeof success === 'function' ? success(res) : ''
-          }
-        }).finally(() => {
-          tab.loading = false
-        })
-      }
     }
   }
 </script>