修改国内贸易

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -125,6 +125,7 @@
               @row-update="rowUpdate"
               @row-del="rowDel"
               @saveColumn="saveColumn('goods')"
+              :cell-style="goodsRowClassName"
           >
             <template slot="code" slot-scope="{row,index}">
               <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="commodityChoice(row)" :disabled="detailData.seeDisabled || !row.$cellEdit">选择</el-button>
@@ -1425,6 +1426,9 @@ export default {
       list.forEach(item => {
         item.cname = item.cname
         this.$set(item, 'specificationAndModel', item.itemType)
+        this.$set(item, 'deliveryAmount', item.amount)
+        this.$set(item, 'actualQuantity', item.orderQuantity)
+        this.$set(item, 'inventoryNumber', item.storageQuantity)
         delete item.id
         delete item.createTime
         delete item.createUser
@@ -1467,6 +1471,13 @@ export default {
         }
       }
     },
+    // 商品表格加色
+    goodsRowClassName({row, column, rowIndex, columnIndex}) {
+      if (Number(row.actualQuantity) > Number(row.inventoryNumber) && column.property == 'inventoryNumber') {
+        return "color: #fff;background:#a4cf57"
+      }
+      return '';
+    },
   }
 }
 </script>

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -574,27 +574,27 @@ export default {
       basicData: {
         column: [
           {
-            label: '系统编号',
-            prop: 'sysNo',
-            disabled: true,
+            label: '供应商',
+            prop: 'corpId',
+            span: 16,
             rules: [
               {
-                required: false,
+                required: true,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '来源单号',
-            prop: 'orgOrderNo',
+          },{
+            label: '付款方式',
+            prop: 'paymentType',
             rules: [
               {
-                required: false,
+                required: true,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
-          }, {
+          },{
             label: ' 银行账号',
             prop: 'banks',
             rules: [
@@ -605,19 +605,18 @@ export default {
               }
             ]
           }, {
-            label: '供应商',
-            prop: 'corpId',
-            span: 16,
+            label: '公司户头',
+            prop: 'banksAccountName',
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
           }, {
-            label: '付款方式',
-            prop: 'paymentType',
+            label: '包装要求',
+            prop: 'packageRemarks',
             rules: [
               {
                 required: true,
@@ -625,9 +624,11 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
-            label: '公司户头',
-            prop: 'banksAccountName',
+          },
+          {
+            label: '系统编号',
+            prop: 'sysNo',
+            disabled: true,
             rules: [
               {
                 required: false,
@@ -636,11 +637,11 @@ export default {
               }
             ]
           }, {
-            label: '包装要求',
-            prop: 'packageRemarks',
+            label: '来源单号',
+            prop: 'orgOrderNo',
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -1297,6 +1297,18 @@ export default {
     this.$set(this.form, 'overPayment', 0)
     this.$set(this.form, 'orderAmount', 0)
     this.$set(this.form, 'predictOceanFreight', 0)
+    let date = new Date();
+    let year = date.getFullYear();
+    let month = date.getMonth() + 1;
+    let day = date.getDate();
+    if (month < 10) {
+      month = "0" + month;
+    }
+    if (day < 10) {
+      day = "0" + day;
+    }
+    let nowDate = year + "-" + month + "-" + day + ' 00:00:00';
+    this.$set(this.form, 'businesDate', nowDate)
     if (this.detailData.id) {
       this.queryData(this.detailData.id)
     }