Merge remote-tracking branch 'origin/dev' 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/crop-dialog/main.vue

@@ -34,6 +34,7 @@
               @selection-change="selectionChange"
               @on-load="onLoad"
               @tree-load="treeLoad"
+              :cell-style="cellStyle"
             >
             </avue-crud>
           </el-col>
@@ -110,8 +111,11 @@ export default {
     option.height = window.innerHeight - 500;
   },
   methods: {
-    init(){
-      this.portinfoVisible=true
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    init() {
+      this.portinfoVisible = true;
     },
     closed() {
       this.$refs.crud.toggleSelection();
@@ -119,7 +123,7 @@ export default {
     importCorp() {
       this.$emit("importCorp", {
         id: this.selectionList[0].id,
-        name:this.selectionList[0].cname
+        name: this.selectionList[0].cname
       });
       this.portinfoVisible = false;
     },

src/components/fee-info/main.vue

@@ -8,6 +8,7 @@
         :option="feeOption"
         @saveColumn="saveColumn"
         :summary-method="summaryMethod"
+        :cell-style="cellStyle"
       >
         <template slot="menuLeft">
           <el-button
@@ -152,6 +153,7 @@
             @size-change="sizeChange"
             :page.sync="page"
             @on-load="onLoad"
+            :cell-style="cellStyle"
           >
           </avue-crud>
         </el-col>
@@ -260,6 +262,9 @@ export default {
     cropDialog
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     importCorp(row) {
       this.feeData.push({
         itemId: null,

src/components/part-dialog/main.vue

@@ -18,6 +18,7 @@
           @saveColumn="saveColumn"
           @selection-change="selectionChange"
           :summary-method="summaryMethod"
+          :cell-style="cellStyle"
         >
           <template slot="menuLeft">
             <el-button
@@ -38,7 +39,7 @@
               size="small"
               type="text"
               style="padding:4px 10px;float:left"
-              @click="rePick(row,index)"
+              @click="rePick(row, index)"
               >选择</el-button
             >
             <span> {{ row.goodName }}</span>
@@ -105,12 +106,15 @@ export default {
   },
   created() {},
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     rePick(row, index) {
-      console.log()
-      this.$emit('partReData',{
+      console.log();
+      this.$emit("partReData", {
         ...row,
         index: index
-      })
+      });
       // this.$message({
       //   type: "warning",
       //   message: "正在开发中!"

src/components/report-dialog/main.vue

@@ -16,6 +16,7 @@
       :page.sync="page"
       @current-change="currentChange"
       @size-change="sizeChange"
+      :cell-style="cellStyle"
     >
       <template slot-scope="{ row }" slot="name">
         <el-tag style="cursor:pointer" @click="goReport(row.name)">{{
@@ -81,8 +82,8 @@ export default {
     reportName: {
       type: String
     },
-    reportId:{
-      type:String
+    reportId: {
+      type: String
     }
   },
   filters: {
@@ -91,6 +92,9 @@ export default {
     }
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     onClose() {
       this.visible = false;
       Object.assign(this.$data, this.$options.data());
@@ -120,7 +124,7 @@ export default {
     switchDialog: function(i) {
       this.visible = i;
       this.query = {
-        name: this.reportName?this.reportName:this.$router.currentRoute.name
+        name: this.reportName ? this.reportName : this.$router.currentRoute.name
       };
       if (i) {
         this.getList();

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/components/upload-file/main.vue

@@ -12,6 +12,7 @@
         @row-del="rowDel"
         :upload-after="uploadAfter"
         @saveColumn="saveColumn"
+        :cell-style="cellStyle"
       >
         <template slot="menuLeft">
           <el-button
@@ -77,6 +78,9 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(35), option);
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     //新增附件上传保存触发
     rowSave(row, done, loading) {
       this.fileData.push(row);

src/views/basicData/commodityType/configuration/customerPurchase.json

@@ -94,7 +94,7 @@
             ]
         },{
             "label": "金额",
-            "prop": "typeno",
+            "prop": "amount",
             "index": 4,
             "width":150,
             "cell": true,

src/views/basicData/commodityType/configuration/specification.json

@@ -29,7 +29,7 @@
     },
     {
       "label": "描述",
-      "prop": "describe",
+      "prop": "description",
       "minWidth": 100,
       "cell": true
     },

src/views/basicData/commodityType/detailsPageEdit.vue

@@ -69,6 +69,12 @@
                 >
                   <!--                  <el-option v-for="(item,index) in selectData" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>-->
                 </el-select>
+                <selectComponent
+                  v-else-if="item.prop === 'corpId'"
+                  v-model="form[item.prop]"
+                  :configuration="configuration"
+                  style="width: 100%"
+                />
                 <el-input
                   type="age"
                   v-else
@@ -302,6 +308,13 @@ export default {
   name: "detailsPage",
   data() {
     return {
+      configuration: {
+        multipleChoices: false,
+        multiple: false,
+        collapseTags: false,
+        placeholder: "请点击右边按钮选择",
+        dicData: []
+      },
       sftOption: sftOption,
       sftData: [],
       text:
@@ -440,7 +453,7 @@ export default {
           },
           {
             label: "计量单位",
-            prop: "productCategory",
+            prop: "unit",
             rules: [
               {
                 required: false,
@@ -461,6 +474,17 @@ export default {
             ]
           },
           {
+            label: "供应商",
+            prop: "corpId",
+            rules: [
+              {
+                required: true,
+                message: " ",
+                trigger: "blur"
+              }
+            ]
+          },
+          {
             label: "中文描述",
             prop: "nameDescription",
             span: 24,
@@ -775,6 +799,11 @@ export default {
           });
         }
         if (valid && valids) {
+          this.configuration.dicData.forEach(e => {
+            if (e.id == this.form.corpId) {
+              this.form.corpName = e.cname;
+            }
+          });
           const params = {
             ...this.form,
             type: 0,
@@ -924,6 +953,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-form-item__content {
+  line-height: 32px;
+}
 .back-icon {
   line-height: 64px;
   font-size: 20px;

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/basicData/productInformation/detailsPageEdit.vue

@@ -2,17 +2,21 @@
   <div class="borderless">
     <div class="customer-head">
       <div class="customer-back">
-        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
-                   @click="backToList">返回列表
+        <el-button
+          type="danger"
+          style="border: none;background: none;color: red"
+          icon="el-icon-arrow-left"
+          @click="backToList"
+          >返回列表
         </el-button>
       </div>
       <el-button
-          class="el-button--small-yh add-customer-btn"
-          type="primary"
-          :disabled="disabled"
-          @click="editProductInfo"
-          size="small"
-      >{{ form.id ? '确认修改' : '确认新增' }}
+        class="el-button--small-yh add-customer-btn"
+        type="primary"
+        :disabled="disabled"
+        @click="editProductInfo"
+        size="small"
+        >{{ form.id ? "确认修改" : "确认新增" }}
       </el-button>
     </div>
     <div style="margin-top: 60px">
@@ -21,16 +25,20 @@
         <avue-form ref="form" v-model="form" :option="option">
           <template slot="goodsTypeId" slot-scope="scope">
             <avue-input-tree
-                v-model="form.goodsTypeId"
-                :props="{ label: 'title', value: 'id' }"
-                multiple
-                placeholder=" "
-                type="tree"
-                :dic="dicData"/>
+              v-model="form.goodsTypeId"
+              :props="{ label: 'title', value: 'id' }"
+              multiple
+              placeholder=" "
+              type="tree"
+              :dic="dicData"
+            />
           </template>
           <template slot="corpId" slot-scope="scope">
-            <selectComponent v-model="form.corpId"
-                             :configuration="configuration" style="width: 100%"/>
+            <selectComponent
+              v-model="form.corpId"
+              :configuration="configuration"
+              style="width: 100%"
+            />
           </template>
           <template slot="a" slot-scope="scope">
             <el-input
@@ -46,7 +54,12 @@
   </div>
 </template>
 <script>
-import {getDetail, updateDetail, getDeptTree, priceDelete} from "@/api/basicData/commodityType";
+import {
+  getDetail,
+  updateDetail,
+  getDeptTree,
+  priceDelete
+} from "@/api/basicData/commodityType";
 
 export default {
   name: "detailsPage",
@@ -56,12 +69,12 @@ export default {
         multipleChoices: false,
         multiple: false,
         collapseTags: false,
-        placeholder: '请点击右边按钮选择',
+        placeholder: "请点击右边按钮选择",
         dicData: []
       },
       form: {},
       disabled: false,
-      userDialog: false,//供应商导入窗口
+      userDialog: false, //供应商导入窗口
       dicData: [],
       detailsSelect: {},
       option: {
@@ -78,7 +91,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "产品名称",
@@ -103,7 +116,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "花纹",
@@ -115,7 +128,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "品牌",
@@ -127,20 +140,23 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "状态",
             prop: "status",
             span: 8,
-            type: 'select',
-            dicData: [{
-              label: '正常',
-              value: 0
-            }, {
-              label: '停用',
-              value: 1
-            }],
+            type: "select",
+            dicData: [
+              {
+                label: "正常",
+                value: 0
+              },
+              {
+                label: "停用",
+                value: 1
+              }
+            ]
           },
           {
             label: "规格",
@@ -152,7 +168,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "规格1",
@@ -164,7 +180,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "规格2",
@@ -176,7 +192,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "级别",
@@ -188,7 +204,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "产地",
@@ -200,12 +216,12 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "三包",
             prop: "threeGuarantees",
-            span: 8,
+            span: 8
           },
           {
             label: "供应商",
@@ -217,11 +233,11 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "箱立方",
-            prop: "a",
+            prop: "cntrVolumn",
             span: 8,
             rules: [
               {
@@ -229,7 +245,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "备注",
@@ -239,8 +255,8 @@ export default {
             span: 24
           }
         ]
-      },
-    }
+      }
+    };
   },
   //初始化查询
   created() {
@@ -249,10 +265,10 @@ export default {
     });
     if (this.$route.query.id) {
       getDetail(JSON.parse(this.$route.query.id)).then(res => {
-        this.form = res.data.data
-      })
+        this.form = res.data.data;
+      });
     } else {
-      this.$set(this.form, "goodsTypeId", this.$route.query.treeDeptId)
+      this.$set(this.form, "goodsTypeId", this.$route.query.treeDeptId);
     }
   },
   methods: {
@@ -267,25 +283,30 @@ export default {
       });
     },
     rowContactCell(row, index) {
-      this.$refs.crudContact.rowCell(row, index)
+      this.$refs.crudContact.rowCell(row, index);
     },
     rowPurchaseCell(row, index) {
-      this.$refs.crudPurchase.rowCell(row, index)
+      this.$refs.crudPurchase.rowCell(row, index);
     },
     //修改提交触发
     editProductInfo() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         //校验明细列表
         if (valid) {
+          this.configuration.dicData.forEach(e => {
+            if (e.id == this.form.corpId) {
+              this.form.corpName = e.cname;
+            }
+          });
           const params = {
             ...this.form,
-            type: 0,
-          }
+            type: 0
+          };
           updateDetail(params).then(res => {
             if (res.data.success) {
-              this.$message.success("操作成功！")
+              this.$message.success("操作成功！");
             }
-          })
+          });
         } else {
           return false;
         }
@@ -295,16 +316,15 @@ export default {
     backToList() {
       this.$router.$avueRouter.closeTag();
       this.$router.push({
-        path: '/basicData/productInformation/index',
+        path: "/basicData/productInformation/index",
         query: {}
       });
     }
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>
-
 .back-icon {
   line-height: 64px;
   font-size: 20px;
@@ -320,7 +340,8 @@ export default {
     margin: 1vh auto 0 !important;
     padding-bottom: 10px !important;
 
-    .el-dialog__body, .el-dialog__footer {
+    .el-dialog__body,
+    .el-dialog__footer {
       padding-bottom: 0 !important;
       padding-top: 0 !important;
     }

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,

src/views/exportTrade/customerInquiry/config/mainList.json

@@ -8,7 +8,7 @@
   "delBtn": false,
   "addBtn": false,
   "align": "center",
-  "menuWidth": "150",
+  "menuWidth": "120",
   "showSummary": true,
   "searchIcon": true,
   "searchIndex": 2,

src/views/exportTrade/customerInquiry/index.vue

@@ -17,6 +17,7 @@
         @saveColumn="saveColumn"
         :cell-style="cellStyle"
         :summary-method="summaryMethod"
+        @selection-change="selectionChange"
       >
         <template slot-scope="{ row }" slot="createUser">
           <span>{{ row.createUserName }}</span>
@@ -137,11 +138,13 @@ export default {
       page: {
         pageSize: 10,
         currentPage: 1,
-        total: 0
+        total: 0,
+        pageSizes:[10,50,100,200,300,400,500]
       },
       show: true,
       detailData: {},
-      loading: false
+      loading: false,
+      selectionList:[]
     };
   },
   components: { detailPage },
@@ -201,6 +204,9 @@ export default {
         });
       });
     },
+    selectionChange(list){
+      this.selectionList=list
+    },
     //查看跳转页面
     beforeOpenPage(row, status) {
       this.detailData = {

src/views/exportTrade/invoice/config/mainList.json

@@ -8,7 +8,7 @@
   "delBtn": false,
   "addBtn": false,
   "align": "center",
-  "menuWidth": "150",
+  "menuWidth": "120",
   "searchLabelWidth": "90",
   "showSummary": true,
   "searchIcon": true,

src/views/exportTrade/invoice/index.vue

@@ -134,7 +134,8 @@ export default {
       page: {
         pageSize: 10,
         currentPage: 1,
-        total: 0
+        total: 0,
+        pageSizes:[10,50,100,200,300,400,500]
       },
       show: true,
       detailData: {},

src/views/exportTrade/purchaseContract/config/mainList.json

@@ -8,7 +8,7 @@
   "delBtn": false,
   "addBtn": false,
   "align": "center",
-  "menuWidth": "150",
+  "menuWidth": "120",
   "searchLabelWidth": "90",
   "searchIcon": true,
   "searchIndex": 2,

src/views/exportTrade/purchaseContract/index.vue

@@ -136,7 +136,8 @@ export default {
       page: {
         pageSize: 10,
         currentPage: 1,
-        total: 0
+        total: 0,
+        pageSizes:[10,50,100,200,300,400,500]
       },
       show: true,
       detailData: {},

src/views/exportTrade/purchaseInquiry/config/mainList.json

@@ -8,7 +8,7 @@
   "delBtn": false,
   "addBtn": false,
   "align": "center",
-  "menuWidth": "150",
+  "menuWidth": "120",
   "searchIcon": true,
   "searchIndex": 2,
   "showSummary": true,

src/views/exportTrade/purchaseInquiry/index.vue

@@ -123,7 +123,8 @@ export default {
       page: {
         pageSize: 10,
         currentPage: 1,
-        total: 0
+        total: 0,
+        pageSizes:[10,50,100,200,300,400,500]
       },
       show: true,
       detailData: {},

src/views/exportTrade/receipt/config/mainList.json

@@ -8,7 +8,7 @@
   "delBtn": false,
   "addBtn": false,
   "align": "center",
-  "menuWidth": "150",
+  "menuWidth": "120",
   "searchLabelWidth": "90",
   "showSummary": true,
   "searchIcon": true,

src/views/exportTrade/receipt/index.vue

@@ -118,7 +118,8 @@ export default {
       page: {
         pageSize: 10,
         currentPage: 1,
-        total: 0
+        total: 0,
+        pageSizes:[10,50,100,200,300,400,500]
       },
       show: true,
       detailData: {},

src/views/exportTrade/salesContract/config/mainList.json

@@ -8,7 +8,7 @@
   "delBtn": false,
   "addBtn": false,
   "align": "center",
-  "menuWidth": "150",
+  "menuWidth": "120",
   "searchIcon": true,
   "searchIndex": 2,
   "searchLabelWidth": 90,

src/views/exportTrade/salesContract/index.vue

@@ -140,7 +140,8 @@ export default {
       page: {
         pageSize: 10,
         currentPage: 1,
-        total: 0
+        total: 0,
+        pageSizes:[10,50,100,200,300,400,500]
       },
       show: true,
       detailData: {},

src/views/exportTrade/shippingInquiry/config/mainList.json

@@ -8,7 +8,7 @@
   "delBtn": false,
   "addBtn": false,
   "align": "center",
-  "menuWidth": "80",
+  "menuWidth": "70",
   "searchIcon": true,
   "searchIndex": 2,
   "selection": true,

src/views/exportTrade/shippingInquiry/index.vue

@@ -111,7 +111,8 @@ export default {
       page: {
         pageSize: 10,
         currentPage: 1,
-        total: 0
+        total: 0,
+        pageSizes:[10,50,100,200,300,400,500]
       },
       show: true,
       detailData: {},

src/views/maintenance/priceLibrary/config/mainList.json

@@ -8,7 +8,7 @@
   "delBtn": false,
   "addBtn": false,
   "align": "center",
-  "menuWidth": "180",
+  "menuWidth": "120",
   "showSummary": true,
   "searchIcon": true,
   "searchIndex": 2,
@@ -54,19 +54,26 @@
       "overHidden": true
     },
     {
+      "label": "汇率",
+      "prop": "exchangeRate",
+      "width": 100,
+      "index": 6,
+      "overHidden": true
+    },
+    {
       "label": "FOB系数",
       "prop": "coefficient",
-      "index": 6,
+      "index": 7,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "价格类型",
       "prop": "billType",
-      "index": 7,
+      "index": 8,
       "width": 100,
       "overHidden": true,
-      "dicData":[],
+      "dicData": [],
       "props": {
         "label": "dictValue",
         "value": "dictKey"
@@ -75,84 +82,126 @@
     {
       "label": "最新价格",
       "prop": "price",
-      "index": 8,
+      "index": 9,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "美元价格",
+      "prop": "greenback",
+      "index": 10,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "采购价格",
+      "prop": "purchaseAmount",
+      "index": 11,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "税率",
+      "prop": "taxRate",
+      "index": 12,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "商品类别",
+      "prop": "goodsTypeName",
+      "index": 13,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "是否重点推荐",
+      "prop": "priorityReferrer",
+      "index": 14,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "推荐理由",
+      "prop": "referrerReason",
+      "index": 15,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "历史价格1",
       "prop": "priceOne",
-      "index": 9,
+      "index": 16,
       "width": 100,
       "overHidden": true
     },
     {
-      "label": "历史价格1日期",
+      "label": "历史日期1",
       "prop": "priceOneTime",
-      "index": 10,
+      "index": 17,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "历史价格2",
       "prop": "priceTwo",
-      "index": 11,
+      "index": 18,
       "width": 100,
       "overHidden": true
     },
     {
-      "label": "历史价格2日期",
+      "label": "历史日期2",
       "prop": "priceTwoTime",
-      "index": 12,
+      "index": 19,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "历史价格3",
       "prop": "priceThree",
-      "index": 13,
+      "index": 20,
       "width": 100,
       "overHidden": true
     },
     {
-      "label": "历史价格3日期",
+      "label": "历史日期3",
       "prop": "priceThreeTime",
-      "index": 14,
+      "index": 21,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "备注",
       "prop": "remarks",
-      "index": 15,
+      "index": 22,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "有效期开始",
       "prop": "startTime",
-      "index": 16,
+      "index": 23,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "有效期结束",
       "prop": "endTime",
-      "index": 17,
+      "index": 24,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "业务员",
       "prop": "person",
-      "index": 18,
+      "index": 25,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "状态",
       "prop": "status",
-      "index": 18,
+      "index": 26,
       "width": 100,
       "overHidden": true
     }

src/views/maintenance/priceLibrary/detailsPage.vue

@@ -142,7 +142,7 @@ export default {
           {
             label: "汇率",
             prop: "exchangeRate",
-            disabled:true,
+            disabled: true,
             span: 8
           },
           {
@@ -192,6 +192,11 @@ export default {
             prop: "greenback",
             span: 8
           },
+          { 
+            label: "采购价格",
+            prop: "purchaseAmount",
+            span: 8
+          },
           {
             label: "税率",
             prop: "taxRate",

src/views/maintenance/priceLibrary/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="show" class="page-crad">
+    <basic-container class="page-crad">
       <avue-crud
         ref="crud"
         :option="option"
@@ -23,9 +23,16 @@
             type="primary"
             icon="el-icon-plus"
             size="small"
-            @click.stop="newAdd()"
-            >新单</el-button
+            @click.stop="excelBox = !excelBox"
+            >导入</el-button
           >
+          <el-button
+            type="success"
+            icon="el-icon-upload2"
+            size="small"
+            @click="derivation()"
+            >下载模板
+          </el-button>
           <el-button type="info" size="small">报表</el-button>
         </template>
         <template slot="cnameSearch">
@@ -34,6 +41,14 @@
             :configuration="goodsConfiguration"
           />
         </template>
+        <template slot="priorityReferrer" slot-scope="{ row }">
+          <el-checkbox
+            :disabled="!row.$cellEdit"
+            v-model="row.priorityReferrer"
+            :true-label="1"
+            :false-label="0"
+          />
+        </template>
         <template slot="corpIdSearch">
           <select-component
             v-model="search.corpId"
@@ -52,13 +67,6 @@
         <template slot-scope="scope" slot="menu">
           <el-button
             type="text"
-            icon="el-icon-view"
-            size="small"
-            @click.stop="beforeOpenPage(scope.row, 1)"
-            >查看
-          </el-button>
-          <el-button
-            type="text"
             icon="el-icon-edit"
             size="small"
             @click.stop="editOpen(scope.row, 2)"
@@ -73,15 +81,26 @@
           </el-button>
         </template>
       </avue-crud>
+      <el-dialog
+        title="导入价格"
+        append-to-body
+        :visible.sync="excelBox"
+        width="555px"
+      >
+        <avue-form
+          :option="excelOption"
+          v-model="excelForm"
+          :upload-after="uploadAfter"
+        />
+      </el-dialog>
     </basic-container>
-    <detail-page @goBack="goBack" :detailData="detailData" v-else></detail-page>
   </div>
 </template>
 
 <script>
 import option from "./config/mainList.json";
+import { getToken } from "@/util/auth";
 import { getList, remove } from "@/api/maintenance/priceLibrary";
-import detailPage from "./detailsPage.vue";
 import { defaultDate } from "@/util/date";
 import { micrometerFormat } from "@/util/validate";
 import { orderStateFormat } from "@/enums/order-stauts";
@@ -90,6 +109,27 @@ export default {
   name: "customerInformation",
   data() {
     return {
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: "导入数据",
+            prop: "excelFile",
+            type: "upload",
+            drag: true,
+            loadText: "导入数据中，请稍等",
+            span: 24,
+            propsHttp: {
+              res: "data"
+            },
+            tip: "请上传 .xls,.xlsx 标准格式文件",
+            action: "/api/blade-mocha-item/pricebank/importPrice"
+          }
+        ]
+      },
+      excelBox: false,
+      excelForm: {},
       goodsConfiguration: {
         multipleChoices: false,
         multiple: false,
@@ -116,14 +156,13 @@ export default {
       page: {
         pageSize: 10,
         currentPage: 1,
-        total: 0
+        total: 0,
+        pageSizes: [10, 50, 100, 200, 300, 400, 500]
       },
-      show: true,
       detailData: {},
       loading: false
     };
   },
-  components: { detailPage },
   async created() {
     /**
      * 已定义全局方法，直接使用，getColumnData获取列数据，参数传值(表格名称，引入的本地JSON的数据定义的名称)
@@ -131,28 +170,8 @@ export default {
      * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
      */
     this.option = await this.getColumnData(this.getColumnName(50), option);
-    let _this = this;
-    this.option.column.forEach(e => {
-      if (e.prop == "exchangeRate") {
-        e.formatter = function(row) {
-          return _this.textFormat(
-            Number(row.exchangeRate ? row.exchangeRate : 0) / 100,
-            "0.00%"
-          );
-        };
-      }
-      if (e.prop == "creditAmount") {
-        e.formatter = function(row) {
-          return _this.textFormat(
-            Number(row.creditAmount ? row.creditAmount : 0),
-            "#,##0.00"
-          );
-        };
-      }
-    });
     this.getWorkDicts("billType").then(res => {
-      this.findObject(this.option.column, "billType").dicData =
-        res.data.data;
+      this.findObject(this.option.column, "billType").dicData = res.data.data;
     });
   },
   filters: {
@@ -164,6 +183,26 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
+    uploadAfter(res, done, loading, column) {
+      this.excelBox = false;
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+      loading();
+      done();
+    },
+    derivation() {
+      this.$confirm("是否下载模板?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        window.open(
+          `/api/blade-mocha-item/pricebank/exportPrice?${
+            this.website.tokenHeader
+          }=${getToken()}`
+        );
+      });
+    },
     //删除列表后面的删除按钮触发触发(row, index, done)
     rowDel(row, index, done) {
       this.$confirm("确定删除数据?", {
@@ -182,20 +221,8 @@ export default {
         });
       });
     },
-    //查看跳转页面
-    beforeOpenPage(row, status) {
-      this.detailData = {
-        id: row.id,
-        status: status
-      };
-      this.show = false;
-    },
     editOpen(row, status) {
-      this.detailData = {
-        id: row.id,
-        status: status
-      };
-      this.show = false;
+      console.log(row, status);
     },
     //点击搜索按钮触发
     searchChange(params, done) {
@@ -266,13 +293,6 @@ export default {
     refreshChange() {
       this.onLoad(this.page, this.search);
     },
-    newAdd() {
-      this.show = false;
-    },
-    goBack() {
-      this.detailData = this.$options.data().detailData;
-      this.show = true;
-    },
     async saveColumn() {
       /**
        * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
@@ -289,11 +309,6 @@ export default {
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
     }
-  },
-  watch: {
-    option: function() {
-      this.search.businesDate = defaultDate();
-    }
   }
 };
 </script>

src/views/mallManagement/commodity/productList/detailsPageEdit.vue

@@ -186,7 +186,7 @@ export default {
   data() {
     return {
       form: {
-        details:'<h1 class="ql-align-center" style="text-align: center;"><a href="https://avuejs.com/doc/plugins/ueditor-plugins" target="_blank" style="font-weight: bold; color: rgb(194, 79, 74);">欢迎使用Avue富文本编辑器</a></h1><p class="ql-align-center" style="text-align: center;"><span style="font-weight: bold; color: rgb(194, 79, 74);"><img src="https://avuejs.com/images/logo-bg.jpg" height="200" width="200"></span></p>'
+        details:'<p style="text-align: center;"><br></p>'
       },
       page: {
         pageSize: 10,