国内贸易修改

src/api/basicData/configuration.js

@@ -163,6 +163,6 @@ export function pleaseCheck(data) {
   return request({
     url: '/api/blade-purchase-sales/order/checkOrder',
     method: 'post',
-    params: data
+    data: data
   })
 }

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -820,6 +820,7 @@ export default {
         orderStatus: "录入"
       },
       oldGoodsList: [],
+      oldGiftList: [],
       oldFeesList: [],
       oldUploadList: [],
       // 导入销售订单明细
@@ -1092,10 +1093,12 @@ export default {
           })
         }
         this.oldGoodsList = []
+        this.oldGiftList = []
         this.oldFeesList = []
         this.oldUploadList = []
         this.oldForm = Object.assign({}, this.form)
-        this.oldGoodsList = this.deepClone(this.goodsShowData)
+        this.oldGoodsList = this.deepClone(this.contactsData)
+        this.oldGiftList = this.deepClone(this.giftData)
         this.oldFeesList = this.deepClone(this.advantageProjectData)
         this.oldUploadList = this.deepClone(this.bankOfDepositData)
         if (isCopy) {

src/views/businessManagement/inventoryAccount/configuration/mainList.json

@@ -1,4 +1,5 @@
 {
+  "align": "center",
   "lazy": true,
   "tip": false,
   "searchMenuPosition": "right",
@@ -13,7 +14,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 300,
+  "menuWidth": 120,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "searchIcon": true,
@@ -21,7 +22,7 @@
   "searchSpan": 8,
   "column": [
     {
-      "label": "大字(规格编码)",
+      "label": "品号",
       "prop": "code",
       "search": true,
       "index": 1,

src/views/businessManagement/purchaseOrder/configuration/customerContact.json

@@ -25,6 +25,10 @@
     {
       "name": "amount",
       "type": "sum"
+    },
+    {
+      "name": "orderQuantity",
+      "type": "sum"
     }
   ],
   "column":[

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -118,6 +118,9 @@
                   :disabled="item.disabled || detailData.seeDisabled"
                   v-model.trim="form[item.prop]"
                 />
+                <el-select v-else-if="item.prop === 'packageRemarks'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
+                  <el-option v-for="(item,index) in packageOptions" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
                 <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model.trim="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"></el-input>
                 <el-input type="age" v-else v-model.trim="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled" placeholder="请输入"></el-input>
               </el-form-item>
@@ -668,7 +671,7 @@ export default {
               }
             ]
           },{
-            label: ' 银行账号',
+            label: '银行账号',
             prop: 'banks',
             rules: [
               {
@@ -692,7 +695,7 @@ export default {
             prop: 'packageRemarks',
             rules: [
               {
-                required: false,
+                required: true,
                 message: ' ',
                 trigger: 'blur'
               }
@@ -725,7 +728,7 @@ export default {
             type: 'number',
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }
@@ -793,6 +796,7 @@ export default {
         total: 0
       },
       itemType: '采购',
+      packageOptions: [],
     }
   },
   mounted() {
@@ -818,6 +822,9 @@ export default {
     this.getWorkDicts("payment_term").then(res => {
       this.paymentOption = res.data.data
     })
+    this.getWorkDicts("packageRemarks").then(res => {
+      this.packageOptions = res.data.data;
+    });
     if (this.detailData.id) {
       this.queryData(this.detailData.id)
     } else if(this.detailData.copyId) {

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -23,7 +23,7 @@
             审核处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item :disabled="form.status > 0" @click.native="pleaseCheck">请核数据</el-dropdown-item>
+            <el-dropdown-item :disabled="browse" @click.native="pleaseCheck">请核数据</el-dropdown-item>
             <el-dropdown-item v-if="false">审核进度</el-dropdown-item>
             <el-dropdown-item v-if="false">撤销请核</el-dropdown-item>
           </el-dropdown-menu>
@@ -973,7 +973,7 @@ export default {
               }
             ]
           }, {
-            label: '本次溢付款',
+            label: '使用溢付款',
             prop: 'caseOverPayment',
             rules: [
               {
@@ -1449,6 +1449,8 @@ export default {
       applicationDialog:false,
       itemType: '销售',
       packageOptions: [],
+      // 请核状态禁用
+      browse: false,
     }
   },
   mounted() {
@@ -1536,6 +1538,7 @@ export default {
       this.pageLoading = true
       detail(id).then(res => {
         this.form = res.data.data;
+        this.browse = this.form.status > 0? true: false
         this.contactsData = this.form.orderItemsList.filter(item => {
           return item.goodType == 0
         })
@@ -1549,12 +1552,6 @@ export default {
         this.advantageProjectData = this.form.orderFeesList
         this.bankOfDepositData = this.form.orderFilesList
         this.configuration.dicData = this.form.corpName
-        if (this.form.belongToCorpList) {
-          this.companyConfiguration.dicData = this.form.belongToCorpList
-        }
-        if (this.form.productionPlantList) {
-          this.plantConfiguration.dicData = this.form.productionPlantList
-        }
         let feesData = []
         this.form.orderFeesList.forEach(item => {
           let a = {
@@ -1882,6 +1879,7 @@ export default {
           });
         })
       } else {
+        let lsit = []
         this.selection = this.selection.concat(this.giftData)
         this.selection.forEach(item => {
           lsit.push(item.id)
@@ -3048,11 +3046,12 @@ export default {
         }).then(() => {
           const data = {
             id : this.form.id,
+            checkType: 'xsqh'
           }
           this.pageLoading = true
           pleaseCheck(data).then(res => {
-            console.log(res)
-            this.pageLoading = false
+            // this.pageLoading = false
+            this.queryData(this.form.id)
           }).finally(() => {
             this.pageLoading = false
           })