Przeglądaj źródła

fix: 更新组件、限制经销商

zh 2 lat temu
rodzic
commit
224bed706c

+ 7 - 7
package-lock.json

@@ -9,7 +9,7 @@
       "version": "4.4.0",
       "license": "MIT",
       "dependencies": {
-        "@zjlib/element-plugins": "^2.6.9",
+        "@zjlib/element-plugins": "^2.7.1",
         "axios": "0.18.1",
         "clipboard": "^2.0.8",
         "concurrent-tasks": "^1.0.7",
@@ -5555,9 +5555,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "node_modules/@zjlib/element-plugins": {
-      "version": "2.6.9",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.6.9.tgz",
-      "integrity": "sha512-BwPksUIYABQHPpWphy0vXc/zSARAEEqbeRN3qT+lZfQ0Afe/L6zewbqfQ/ycUfzi7KSDvLnRHRBEBuE4jPfVgw==",
+      "version": "2.7.1",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.7.1.tgz",
+      "integrity": "sha512-9Wn/W/WqHxxWhQnPyG9mBg6Fj7hK2uA/OmWSYb9sVDYFTmp3AkT/W68DomDCqKoYMR/13msIvzi0rLZZSjlTlQ==",
       "dependencies": {
         "@turf/turf": "^6.5.0",
         "@vuemap/vue-amap": "^0.1.12",
@@ -31566,9 +31566,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "@zjlib/element-plugins": {
-      "version": "2.6.9",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.6.9.tgz",
-      "integrity": "sha512-BwPksUIYABQHPpWphy0vXc/zSARAEEqbeRN3qT+lZfQ0Afe/L6zewbqfQ/ycUfzi7KSDvLnRHRBEBuE4jPfVgw==",
+      "version": "2.7.1",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.7.1.tgz",
+      "integrity": "sha512-9Wn/W/WqHxxWhQnPyG9mBg6Fj7hK2uA/OmWSYb9sVDYFTmp3AkT/W68DomDCqKoYMR/13msIvzi0rLZZSjlTlQ==",
       "requires": {
         "@turf/turf": "^6.5.0",
         "@vuemap/vue-amap": "^0.1.12",

+ 1 - 1
package.json

@@ -15,7 +15,7 @@
     "test:ci": "npm run lint && npm run test:unit"
   },
   "dependencies": {
-    "@zjlib/element-plugins": "^2.6.9",
+    "@zjlib/element-plugins": "^2.7.1",
     "axios": "0.18.1",
     "clipboard": "^2.0.8",
     "concurrent-tasks": "^1.0.7",

+ 6 - 0
src/views/commercialEngineering/components/base.vue

@@ -98,6 +98,7 @@
           <div class="label">经销商*:</div>
           <div class="value">
             <el-input v-if="isCustomer" v-model="formData.customerName" disabled placeholder="请填写" size="mini" clearable />
+            <el-input v-if="!isCustomer && !isTradeExaminer" v-model="formData.customerName" disabled placeholder="请填写" size="mini" clearable />
             <el-select v-else v-model="formData.customerId" placeholder="请选择" clearable filterable @change="handleCustomer">
               <el-option
                 v-for="item in commonData.customerList"
@@ -560,6 +561,11 @@ export default {
         this.formData.customerNumber = this.customerNumber
         this.formData.customerName = this.customerName
       }
+      if (!this.isCustomer && !this.isTradeExaminer) {
+        this.formData.customerId = '269184'
+        this.formData.customerNumber = '100503'
+        this.formData.customerName = '韶关弘格贸易有限公司'
+      }
     }
   },
   methods: {