修改国内贸易

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

@@ -107,6 +107,21 @@
         }
       ]
     },{
+      "label": "供应商",
+      "prop": "corpId",
+      "index": 4,
+      "width":250,
+      "cell": false,
+      "slot": true,
+      "overHidden": true,
+      "rules": [
+        {
+          "required": false,
+          "message": "请输入供应商",
+          "trigger": "blur"
+        }
+      ]
+    },{
       "label": "包装要求",
       "prop": "packageRemarks",
       "index": 5,

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -164,6 +164,13 @@
               >录入明细
               </el-button>
               <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
+              <el-button
+                type="warning"
+                icon="el-icon-refresh"
+                size="small"
+                :disabled="detailData.seeDisabled"
+                @click="resetStock"
+              >库存刷新</el-button>
             </template>
             <template slot="actualQuantity" slot-scope="{ row }">
               <el-input
@@ -174,6 +181,17 @@
               ></el-input>
               <span v-else>{{ row.actualQuantity }}</span>
             </template>
+            <template slot="corpId" slot-scope="{ row, index }">
+              <crop-select
+                v-if="row.$cellEdit"
+                v-model="row.corpId"
+                :cropIndex="index"
+                corpType="GYS"
+                @getCorpData="getcorpId"
+                :disabled="detailData.seeDisabled"
+              ></crop-select>
+              <span v-else>{{ row.corpName }}</span>
+            </template>
           </avue-crud>
         </basic-container>
         <containerTitle title="费用明细"></containerTitle>
@@ -695,6 +713,16 @@ export default {
               }
             ]
           }, {
+            label: '包装要求',
+            prop: 'packageRemarks',
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          }, {
             label: "备注",
             span: 24,
             type: 'textarea',
@@ -747,6 +775,7 @@ export default {
       this.warehouseTypeOption = res.data.data
     })
     this.$set(this.form,'deliveryStatus','录入')
+    this.$set(this.oldForm,'deliveryStatus','录入')
     wareHouseType().then(res => {
       this.warehouseType = res.data.data.records
       this.warehouseType.forEach(item => {
@@ -928,6 +957,9 @@ export default {
         this.saveLoading = false
       });
     },
+    getcorpId(row) {
+      this.contactsData[row.index].corpId = row.id;
+    },
     // 出库数量变化时调用
     actualQuantityChange(row) {
       if (row.scale) {
@@ -1296,6 +1328,9 @@ export default {
           if (typeof this.form.corpsTypeId == 'object') {
             this.form.corpsTypeId = this.form.corpsTypeId.join(",")
           }
+          this.contactsData.forEach(item => {
+            this.$set(item, 'contractAmount', item.deliveryAmount)
+          })
           this.saveLoading = true
           this.form.billType = 'FH'
           typeSave(this.form).then(res => {
@@ -1478,6 +1513,19 @@ export default {
       }
       return '';
     },
+    // 库存刷新
+    resetStock() {
+      this.contactsData.forEach(item => {
+        selectGoodsNum({
+          goodsId: item.itemId,
+          itemType: item.itemType
+        }).then(res => {
+          item.inventoryNumber = res.data.data
+        }).finally(() => {
+          this.$message.success('刷新成功')
+        })
+      })
+    },
   }
 }
 </script>

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -82,8 +82,18 @@
                   corpType="GYS"
                   :disabled="detailData.seeDisabled"
                 ></crop-select>
-<!--                <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" typeData="GYS"-->
-<!--                                 :configuration="configuration" style="width: 100%" :disabled="detailData.seeDisabled"/>-->
+                <el-select v-else-if="item.prop === 'banks'"
+                           v-model="form[item.prop]" placeholder="请选择"
+                           clearable
+                           filterable
+                           allow-create
+                           default-first-option
+                           size="small"
+                           style="width: 100%;"
+                           @change="banksChange"
+                           :disabled="detailData.seeDisabled">
+                  <el-option v-for="(item,index) in bankList" :key="index" :label="item.accountNo" :value="item.accountNo"></el-option>
+                </el-select>
                 <el-input
                   v-else-if="item.type == 'number'"
                   placeholder="请输入"
@@ -93,7 +103,7 @@
                   v-model.trim="form[item.prop]"
                 />
                 <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"></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>
             </el-col>
           </el-row>
@@ -447,6 +457,7 @@ import { contrastObj, contrastList } from "@/util/contrastData";
 //账单组件
 import ApplyPayment from "../../../components/finance/applyPayment";
 import  billApplication from "@/components/bill/billApplication";
+import { getlistBankBy } from "@/api/basicData/configuration"
 
 export default {
   name: "detailsPage",
@@ -704,6 +715,8 @@ export default {
       rowHeight: '',
       // 查询时loading页面
       pageLoading: false,
+      // 银行账号下拉
+      bankList: [],
     }
   },
   mounted() {
@@ -729,10 +742,6 @@ export default {
     } else if(this.detailData.copyId) {
       this.queryData(this.detailData.copyId, true)
     } else {
-      // let prefix = 'GN-CG'
-      // getSysNo(prefix).then(res => {
-      //   this.$set(this.form, 'sysNo', res.data.data)
-      // })
     }
   },
   watch: {
@@ -818,9 +827,6 @@ export default {
         if (isCopy) {
           delete this.form.sysNo;
           delete this.form.id
-          getSysNo('GN').then(res => {
-            this.$set(this.form, 'sysNo', res.data.data)
-          })
           this.contactsData.forEach(item => {
             delete item.id
             delete item.pid
@@ -1416,6 +1422,21 @@ export default {
         }
       }
     },
+    // 银行账号变化
+    banksChange(val) {
+      let isTrue = false
+      this.bankList.forEach(item => {
+        if (val == item.accountNo) {
+          this.$set(this.form, 'banksAccountName', item.accountName)
+          this.$set(this.form, 'accountBank', item.accountBank)
+          isTrue = true
+        }
+      })
+      if (!isTrue) {
+        this.$set(this.form, 'banksAccountName', null)
+        this.$set(this.form, 'accountBank', null)
+      }
+    },
   }
 }
 </script>

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -206,12 +206,6 @@
                 @getCorpData="getcorpId"
                 :disabled="detailData.seeDisabled"
               ></crop-select>
-<!--              <customer-dialog-->
-<!--                v-if="row.$cellEdit"-->
-<!--                v-model="row.corpName"-->
-<!--                :cropIndex="index"-->
-<!--                @getcorpId="getcorpId"-->
-<!--              ></customer-dialog>-->
               <span v-else>{{ row.corpName }}</span>
             </template>
             <template slot="code" slot-scope="{row,index}">
@@ -303,7 +297,7 @@
                          icon="el-icon-plus"
                          size="small"
                          @click="policy"
-                         :disabled="detailData.seeDisabled">政策
+                         :disabled="detailData.seeDisabled || !form.corpId">政策
               </el-button>
               <el-button type="warning"
                          icon="el-icon-plus"
@@ -668,7 +662,9 @@ export default {
     return {
       saveLoading: false,
       disabled: false,
-      form: {},
+      form: {
+        corpId: null,
+      },
       billType:"收费",  //账单类型
       billData:{},     //账单需要数据
       applySettlementDialog:false,//生成账单组件
@@ -741,10 +737,10 @@ export default {
       policyOption: {
         nodeKey: 'id',
         lazy: true,
-        treeLoad: function (node, resolve) {
+        treeLoad: (node, resolve)=> {
           const parentId = (node.level === 0) ? 0 : node.data.id;
           const newTime = new Date().toLocaleString('chinese',{hour12:false})
-          policyColumn({newTime: newTime,parentId: parentId}).then(res => {
+          policyColumn({newTime: newTime,parentId: parentId,corps: this.form.corpId}).then(res => {
             resolve(res.data.data.map(item => {
               return {
                 ...item,
@@ -1407,9 +1403,11 @@ export default {
           this.$set(this.form, 'orderStatus', '录入')
           delete this.form.id
           delete this.form.orgOrderNo
+          delete this.form.orderNo
           delete this.form.morderNo
           delete this.form.createUserName
           delete this.form.createTime
+          delete this.form.businesDate
           this.contactsData.forEach(item => {
             delete item.id
             delete item.pid
@@ -1722,7 +1720,7 @@ export default {
     },
     getCorpRow(data) {
       this.$set(this.form, 'paymentType', data.paymentType)
-      this.$set(this.form, 'packageRemarks', data.remarks)
+      this.$set(this.form, 'packageRemarks', data.packageRemarks)
       this.$set(this.form, 'arrivalAddress', data.storageAddr)
     },
     getPlantRow(data) {

src/views/businessManagement/salesOrder/index.vue

@@ -417,6 +417,7 @@ export default {
     gobackSearch(params) {
       let data = {};
       data = Object.assign({}, params)
+      console.log(data.businesDate)
       if (data.businesDate && data.businessDate != '') {
         data.orderStartDate = data.businesDate[0]+ " " + "00:00:00"
         data.orderEndDate = data.businesDate[1]+ " " + "23:59:59"