ソースを参照

Merge remote-tracking branch 'origin/dev' into dev

qinbai 3 年 前
コミット
9f8884ea46

+ 1 - 1
src/components/crop-dialog/main.vue

@@ -131,7 +131,7 @@ export default {
       let queryParams = Object.assign({}, params, {
         size: page.pageSize,
         current: page.currentPage,
-        corpsTypeId: this.treeDeptId
+        corpsTypeId: this.treeDeptId,
       });
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records;

+ 3 - 2
src/components/customer-dialog/main.vue

@@ -90,7 +90,7 @@ export default {
         lazy: true,
         treeLoad: function(node, resolve) {
           const parentId = node.level === 0 ? 0 : node.data.id;
-          getDeptLazyTree({parentId:parentId,corpType:"KH"}).then(res => {
+          getDeptLazyTree({parentId:parentId,corpType:"GYS"}).then(res => {
             resolve(
               res.data.data.map(item => {
                 return {
@@ -144,7 +144,8 @@ export default {
       let queryParams = Object.assign({}, params, {
         size: page.pageSize,
         current: page.currentPage,
-        corpsTypeId: this.treeDeptId
+        corpsTypeId: this.treeDeptId,
+        corpType:"GYS"
       });
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records;

+ 3 - 3
src/components/part-dialog/configuration/mainList.json

@@ -3,7 +3,7 @@
   "border": true,
   "index": true,
   "addBtn": false,
-  "menuWidth":150,
+  "menuWidth":70,
   "selection": true,
   "tip":false,
   "delBtn":false,
@@ -13,7 +13,7 @@
     {
       "label": "类型",
       "prop": "goodTypeName",
-      "width": 250
+      "width": 150
     },
     {
       "label": "名称",
@@ -23,7 +23,7 @@
     {
       "label": "数量",
       "prop": "goodNumber",
-      "width": 120
+      "width": 80
     },
     {
       "label": "单价",

+ 1 - 0
src/views/basicData/commodityType/detailsPageEdit.vue

@@ -73,6 +73,7 @@
                   v-else-if="item.prop === 'corpId'"
                   v-model="form[item.prop]"
                   :configuration="configuration"
+                  typeData="GYS"
                   style="width: 100%"
                 />
                 <el-input

+ 1 - 0
src/views/basicData/productInformation/detailsPageEdit.vue

@@ -38,6 +38,7 @@
               v-model="form.corpId"
               :configuration="configuration"
               style="width: 100%"
+              typeData="GYS"
             />
           </template>
           <template slot="cntrVolumn" slot-scope="scope">

+ 74 - 19
src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -57,6 +57,40 @@
               @getRow="rowCorpdata"
             ></select-component>
           </template>
+          <template slot="priceTerms">
+            <el-select
+              size="small"
+              v-model="form.priceTerms"
+              placeholder="请选择"
+              @change="priceTermsChange"
+              clearable
+            >
+              <el-option
+                v-for="item in priceTermsList"
+                :key="item.id"
+                :label="item.dictValue"
+                :value="item.dictValue"
+              >
+              </el-option>
+            </el-select>
+          </template>
+          <template slot="paymentType">
+            <el-select
+              size="small"
+              v-model="form.paymentType"
+              placeholder="请选择"
+              @change="paymentTypeChange"
+              clearable
+            >
+              <el-option
+                v-for="item in paymentTermList"
+                :key="item.id"
+                :label="item.dictValue"
+                :value="item.dictValue"
+              >
+              </el-option>
+            </el-select>
+          </template>
           <template slot="boxNumber">
             <el-input
               size="mini"
@@ -450,7 +484,7 @@ export default {
       switchDialog: false,
       form: {
         orderStatus: "录入",
-        businesDate:dateFormat(new Date(), "yyyy-MM-dd")+" 00:00:00"
+        businesDate: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00"
       },
       disabled: false,
       dialogVisible: false,
@@ -534,17 +568,16 @@ export default {
               value: "dictValue"
             }
           },
-
           {
             label: "价格条款",
             prop: "priceTerms",
-            span: 8,
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=pricing_terms",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            }
+            span: 8
+            // type: "select",
+            // dicData:[],
+            // props: {
+            //   label: "dictValue",
+            //   value: "dictValue"
+            // }
           },
           {
             label: "条款说明",
@@ -554,13 +587,13 @@ export default {
           {
             label: "收款方式",
             prop: "paymentType",
-            span: 8,
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_term",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            }
+            span: 8
+            // type: "select",
+            // dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_term",
+            // props: {
+            //   label: "dictValue",
+            //   value: "dictValue"
+            // }
           },
           {
             label: "收款说明",
@@ -733,7 +766,7 @@ export default {
       orderFeesList: [],
       oldform: {
         orderStatus: "录入",
-        businesDate:dateFormat(new Date(), "yyyy-MM-dd")+" 00:00:00"
+        businesDate: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00"
       },
       olddata: [],
       oldorderFeesList: [],
@@ -745,7 +778,9 @@ export default {
       partreData: null,
       partType: false,
       partList: [],
-      goodsoptions: []
+      goodsoptions: [],
+      priceTermsList: [],
+      paymentTermList: []
     };
   },
   props: {
@@ -783,12 +818,18 @@ export default {
     this.getWorkDicts("unit").then(res => {
       this.findObject(this.tableOption.column, "unit").dicData = res.data.data;
     });
+    this.getWorkDicts("pricing_terms").then(res => {
+      this.priceTermsList = res.data.data;
+    });
+    this.getWorkDicts("payment_term").then(res => {
+      this.paymentTermList = res.data.data;
+    });
     getPorts().then(res => {
       this.findObject(this.option.column, "portOfLoad").dicData = res.data;
       this.findObject(this.option.column, "portOfDestination").dicData =
         res.data;
     });
-    getGoods(1,500).then(res => {
+    getGoods(1, 500).then(res => {
       this.goodsoptions = res.data.data.records;
     });
   },
@@ -807,6 +848,20 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
+    priceTermsChange(row) {
+      this.priceTermsList.forEach(e => {
+        if (row == e.dictValue) {
+          this.form.priceTermsDescription = e.remark;
+        }
+      });
+    },
+    paymentTypeChange(row) {
+      this.paymentTermList.forEach(e => {
+        if (row == e.dictValue) {
+          this.form.paymentTypeDescription = e.remark;
+        }
+      });
+    },
     addLibrary() {
       if (!this.form.corpId) {
         return this.$message.error("请选择客户名称");

+ 73 - 17
src/views/exportTrade/salesContract/detailsPage.vue

@@ -57,6 +57,40 @@
               @getRow="rowCorpdata"
             ></select-component>
           </template>
+          <template slot="priceTerms">
+            <el-select
+              size="small"
+              v-model="form.priceTerms"
+              placeholder="请选择"
+              @change="priceTermsChange"
+              clearable
+            >
+              <el-option
+                v-for="item in priceTermsList"
+                :key="item.id"
+                :label="item.dictValue"
+                :value="item.dictValue"
+              >
+              </el-option>
+            </el-select>
+          </template>
+          <template slot="paymentType">
+            <el-select
+              size="small"
+              v-model="form.paymentType"
+              placeholder="请选择"
+              @change="paymentTypeChange"
+              clearable
+            >
+              <el-option
+                v-for="item in paymentTermList"
+                :key="item.id"
+                :label="item.dictValue"
+                :value="item.dictValue"
+              >
+              </el-option>
+            </el-select>
+          </template>
           <template slot="boxNumber">
             <el-input
               size="mini"
@@ -571,13 +605,13 @@ export default {
           {
             label: "价格条款",
             prop: "priceTerms",
-            span: 8,
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=pricing_terms",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            }
+            span: 8
+            // type: "select",
+            // dicUrl: "/api/blade-system/dict-biz/dictionary?code=pricing_terms",
+            // props: {
+            //   label: "dictValue",
+            //   value: "dictValue"
+            // }
           },
           {
             label: "条款说明",
@@ -587,13 +621,13 @@ export default {
           {
             label: "收款方式",
             prop: "paymentType",
-            span: 8,
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_term",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            }
+            span: 8
+            // type: "select",
+            // dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_term",
+            // props: {
+            //   label: "dictValue",
+            //   value: "dictValue"
+            // }
           },
           {
             label: "收款说明",
@@ -825,7 +859,9 @@ export default {
       partreData: null,
       partType: false,
       partList: [],
-      goodsoptions: []
+      goodsoptions: [],
+      priceTermsList: [],
+      paymentTermList: []
     };
   },
   props: {
@@ -871,7 +907,13 @@ export default {
     this.getWorkDicts("unit").then(res => {
       this.findObject(this.tableOption.column, "unit").dicData = res.data.data;
     });
-    getGoods(1,500).then(res => {
+    this.getWorkDicts("pricing_terms").then(res => {
+      this.priceTermsList = res.data.data;
+    });
+    this.getWorkDicts("payment_term").then(res => {
+      this.paymentTermList = res.data.data;
+    });
+    getGoods(1, 500).then(res => {
       this.goodsoptions = res.data.data.records;
     });
   },
@@ -879,6 +921,20 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
+    priceTermsChange(row) {
+      this.priceTermsList.forEach(e => {
+        if (row == e.dictValue) {
+          this.form.priceTermsDescription = e.remark;
+        }
+      });
+    },
+    paymentTypeChange(row) {
+      this.paymentTermList.forEach(e => {
+        if (row == e.dictValue) {
+          this.form.paymentTypeDescription = e.remark;
+        }
+      });
+    },
     rowCorpdata(row) {
       this.form.coefficient = row.coefficient;
     },
@@ -1217,7 +1273,7 @@ export default {
             itemProp: e.goodNature,
             corpId: e.corpId,
             corpName: e.corpName,
-            itemDescription:e.cnameDescription,
+            itemDescription: e.cnameDescription,
             partsList: [],
             partsPrice: 0,
             itemType: e.specs,