Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/api/basicData/configuration.js

@@ -141,4 +141,13 @@ export function saveSell(data) {
     }
   })
 }
-
+// 查询客户银行list
+export const getlistBankBy = (corpsId) => {
+  return request({
+    url: '/api/blade-client/client/listBankByCorpId',
+    method: 'get',
+    params: {
+      corpsId:corpsId
+    }
+  })
+}

src/components/selectComponent/customerSelect.vue

@@ -147,16 +147,19 @@ export default {
     this.remoteMethod()
   },
   methods: {
-    changeName(){
+    changeName(value){
       let optionList = this.configuration.dicData.length !== 0?this.dicData.length !== 0?this.dicData:this.configuration.dicData:this.dicData;
       let valueName ;
+      let data;
        optionList.map(item =>{
         if(item.id === this.value){
           valueName =  item.cname
+          data = item
         }
       })
       this.$emit('returnBack', this.value)
       this.$emit('valueName',valueName)
+      this.$emit('getRow', data)
     },
     //刷新触发
     refreshChange() {
@@ -180,11 +183,12 @@ export default {
         this.dicData.push({id: this.selection[0].id, cname: this.selection[0].cname})
         this.value = this.selection[0].id
       }
-      this.selection = []
       this.$emit('returnBack', this.value)
-      this.dialogVisible = false
       this.$emit('receiveList',this.dicData)
       this.$emit('valueName',this.dicData[0].cname)
+      this.$emit('getRow', this.selection[0])
+      this.selection = []
+      this.dialogVisible = false
     },
     //选中触发
     selectionChange(selection) {

src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -124,6 +124,21 @@
                   inactive-text="关闭"
                 >
                 </el-switch>
+                <el-select
+                  v-else-if="item.prop === 'paymentType'"
+                  v-model="form[item.prop]"
+                  clearable
+                  filterable
+                  size="small"
+                  style="width: 100%;"
+                >
+                  <el-option
+                    v-for="(item,index) in paymentOption"
+                    :key="index"
+                    :label="item.dictValue"
+                    :value="item.dictValue"
+                  ></el-option>
+                </el-select>
                 <el-input
                   v-else
                   type="age"
@@ -407,6 +422,10 @@ export default {
           {
             label: "FOB系数",
             prop: "coefficient"
+          },
+          {
+            label: '付款方式',
+            prop: 'paymentType'
           }
         ]
       },
@@ -485,9 +504,18 @@ export default {
             mock: {
               type: "county"
             }
-          }
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            span: 24,
+            mock: {
+              type: "county"
+            }
+          },
         ]
-      }
+      },
+      paymentOption: [],
     };
   },
   components: {
@@ -500,6 +528,9 @@ export default {
     areaTypeTree().then(res => {
       this.dicArea = res.data.data;
     });
+    this.getWorkDicts("payment_term").then(res => {
+      this.paymentOption = res.data.data
+    })
     if (this.$route.query.id) {
       let id = this.$route.query.id.replace(/\"/g, "");
       // let id = parseInt(this.$route.query.id)

src/views/basicData/customerInformation/index.vue

@@ -151,7 +151,8 @@ export default {
       page: {
         pageSize: 10,
         pagerCount: 5,
-        total: 0
+        total: 0,
+        pageSizes: [10,50,100,200,300]
       },
       excelBox: false,
       excelLoading:false,

src/views/businessManagement/deliveryNotice/index.vue

@@ -129,6 +129,7 @@ export default {
         pageSize: 10,
         pagerCount: 5,
         total: 0,
+        pageSizes: [10,50,100,200,300]
       },
       // 非单个禁用
       single: true,

src/views/businessManagement/inventoryAccount/index.vue

@@ -91,6 +91,7 @@ export default {
         pageSize: 10,
         pagerCount: 5,
         total: 0,
+        pageSizes: [10,50,100,200,300]
       }
     }
   },

src/views/businessManagement/purchaseOrder/index.vue

@@ -108,6 +108,7 @@ export default {
         pageSize: 10,
         pagerCount: 5,
         total: 0,
+        pageSizes: [10,50,100,200,300]
       },
       // 非单个禁用
       single: true,

src/views/businessManagement/receipt/index.vue

@@ -131,6 +131,7 @@ export default {
         pageSize: 10,
         pagerCount: 5,
         total: 0,
+        pageSizes: [10,50,100,200,300]
       },
       // 非单个禁用
       single: true,

src/views/businessManagement/salesOrder/configuration/commodity.json

@@ -87,7 +87,7 @@
     },
     {
       "label": "供应商",
-      "prop": "providers",
+      "prop": "corpName",
       "slot": true
     },
     {

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -54,10 +54,30 @@
                                 value-format="yyyy-MM-dd HH:mm:ss"
                                 :disabled="detailData.seeDisabled"/>
                 <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]"
-                                 :configuration="configuration" style="width: 100%" :disabled="detailData.seeDisabled"/>
+                                 :configuration="configuration" style="width: 100%" :disabled="detailData.seeDisabled"
+                                 @getRow="getCorpRow"
+                />
+<!--                所属公司带出银行信息-->
+                <selectComponent v-else-if="item.prop === 'belongToCorpId'"
+                                 v-model="form[item.prop]" :configuration="configuration"
+                                 style="width: 100%"
+                                 :disabled="detailData.seeDisabled"
+                                 @returnBack="returnBack"/>
                 <el-select v-else-if="item.prop === 'paymentType'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
                   <el-option v-for="(item,index) in paymentOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
+                <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="请输入"
@@ -67,7 +87,7 @@
                   v-model="form[item.prop]"
                 />
                 <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"></el-input>
-                <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"></el-input>
+                <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled" clearable></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -82,7 +102,6 @@
                                 size="small" type="date" placeholder="选择日期"
                                 value-format="yyyy-MM-dd HH:mm:ss"
                                 :disabled="detailData.seeDisabled"/>
-                <selectComponent v-else-if="item.prop === 'belongToCorpId'" v-model="form[item.prop]" :configuration="configuration" style="width: 100%" :disabled="detailData.seeDisabled"/>
                 <el-input
                   v-else-if="(item.prop === 'advancePayment') || (item.prop === 'settlmentAmount') || (item.prop === 'overPayment')"
                   v-model="form[item.prop]" size="small" autocomplete="off"
@@ -518,6 +537,7 @@ import {
   detailList,
   generateShipment,
   saveSell,
+  getlistBankBy,
 } from "@/api/basicData/configuration"
 import {selectGoodsNum} from "@/api/basicData/inventoryAccount"
 import customerContact from "./configuration/customerContact.json"
@@ -816,17 +836,6 @@ export default {
               }
             ]
           }, {
-            label: '所属公司',
-            prop: 'belongToCorpId',
-            span: 16,
-            rules: [
-              {
-                required: false,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          }, {
             label: '合同日期',
             prop: 'businesDate',
             type: 'date',
@@ -952,19 +961,19 @@ export default {
       basicData: {
         column: [
           {
-            label: '销售订单号',
-            prop: 'orgOrderNo',
-            disabled: true,
+            label: '客户全称',
+            prop: 'corpId',
+            span: 16,
             rules: [
               {
-                required: false,
+                required: true,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
           }, {
-            label: '主订单号',
-            prop: 'morderNo',
+            label: '到货地址',
+            prop: 'arrivalAddress',
             rules: [
               {
                 required: true,
@@ -973,6 +982,18 @@ export default {
               }
             ]
           }, {
+            label: '生产工厂',
+            prop: 'a',
+            span: 16,
+            rules: [
+              {
+                required: true,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },
+          {
             label: '发货地址',
             prop: 'shippingAddress',
             rules: [
@@ -983,8 +1004,8 @@ export default {
               }
             ]
           }, {
-            label: '客户全称',
-            prop: 'corpId',
+            label: '所属公司',
+            prop: 'belongToCorpId',
             span: 16,
             rules: [
               {
@@ -994,8 +1015,9 @@ export default {
               }
             ]
           }, {
-            label: '到货地址',
-            prop: 'arrivalAddress',
+            label: '银行帐号',
+            prop: 'banks',
+            type: 'select',
             rules: [
               {
                 required: true,
@@ -1004,6 +1026,26 @@ export default {
               }
             ]
           }, {
+            label: '公司户头',
+            prop: 'banksAccountName',
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          }, {
+            label: '开户银行',
+            prop: 'accountBank',
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          }, {
             label: '付款方式',
             prop: 'paymentType',
             rules: [
@@ -1024,30 +1066,30 @@ export default {
               }
             ]
           }, {
-            label: '运费',
-            prop: 'oceanFreight',
-            type: 'number',
+            label: '销售订单号',
+            prop: 'orgOrderNo',
+            disabled: true,
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
           }, {
-            label: '银行帐号',
-            prop: 'banks',
+            label: '主订单号',
+            prop: 'morderNo',
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }
             ]
           }, {
-            label: '要求发货日期',
-            prop: 'requiredDeliveryDate',
-            type: 'date',
+            label: '预估运费',
+            prop: 'oceanFreight',
+            type: 'number',
             rules: [
               {
                 required: true,
@@ -1056,8 +1098,8 @@ export default {
               }
             ]
           }, {
-            label: '要求到货日期',
-            prop: 'requiredArrivalDate',
+            label: '要求发货日期',
+            prop: 'requiredDeliveryDate',
             type: 'date',
             rules: [
               {
@@ -1067,11 +1109,12 @@ export default {
               }
             ]
           }, {
-            label: '公司户头',
-            prop: 'banksAccountName',
+            label: '要求到货日期',
+            prop: 'requiredArrivalDate',
+            type: 'date',
             rules: [
               {
-                required: false,
+                required: true,
                 message: ' ',
                 trigger: 'blur'
               }
@@ -1087,6 +1130,8 @@ export default {
           }
         ]
       },
+      // 银行账号下拉
+      bankList: [],
       paymentOption: [],
       statusOption: [],
       // 费用信息排序的最大值
@@ -1489,6 +1534,11 @@ export default {
       this.goodsConfiguration.dicData = this.goodsConfiguration.dicData.concat(data)
       this.removeGoodsRepeat()
     },
+    getCorpRow(data) {
+      this.$set(this.form, 'paymentType', data.paymentType)
+      this.$set(this.form, 'packageRemarks', data.remarks)
+      this.$set(this.form, 'arrivalAddress', data.storageAddr)
+    },
     getRow(event,row) {
       row.priceCategory = event[0].goodsTypeName
       this.$set(row, 'priceType', '一般')
@@ -2054,6 +2104,34 @@ export default {
         }
       }
     },
+    returnBack(val) {
+      getlistBankBy(val).then(res =>{
+        this.$set(this.form, 'banks', null)
+        this.$set(this.form, 'banksAccountName', null)
+        this.$set(this.form, 'accountBank', null)
+        this.bankList = res.data
+        if (this.bankList.length > 0) {
+          this.form.banks = this.bankList[0].accountNo
+          this.form.banksAccountName = this.bankList[0].accountName
+          this.form.accountBank = this.bankList[0].accountBank
+        }
+      })
+    },
+    // 银行账号变化
+    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/index.vue

@@ -109,6 +109,7 @@ export default {
         pageSize: 10,
         pagerCount: 5,
         total: 0,
+        pageSizes: [10,50,100,200,300]
       },
       // 非单个禁用
       single: true,