Merge branch 'dev_bug' into develop

# Conflicts:
#	package-lock.json
#	package.json
#	src/views/sales_control/sales_management/components/customer_sales_form.vue
#	src/views/supply/pickup/components/pickup_form.vue

package-lock.json

@@ -9,7 +9,7 @@
       "version": "4.4.0",
       "license": "MIT",
       "dependencies": {
-        "@zjlib/element-plugins": "^1.1.1",
+        "@zjlib/element-plugins": "^1.1.2",
         "axios": "0.18.1",
         "clipboard": "^2.0.8",
         "concurrent-tasks": "^1.0.7",
@@ -3928,9 +3928,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "node_modules/@zjlib/element-plugins": {
-      "version": "1.1.1",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-1.1.1.tgz",
-      "integrity": "sha512-hobIdUjiYEaghdmlF7i2DPFCnpcperDasmmRZr6FZ99jJGRJEmigPKMOhUBnYKUBbi9b3e6h9IOzdPRmgSzXNg==",
+      "version": "1.1.2",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-1.1.2.tgz",
+      "integrity": "sha512-4HD1cqsnHVrWFxsXhbXapph01vBTa77R0BVMh8fWcZivPnt8g7aoSQ7ZE7AQuMYqBLKf73yTElD6xE6RnGqWUQ==",
       "dependencies": {
         "clipboard": "^2.0.11",
         "core-js": "^3.6.5",
@@ -25054,9 +25054,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "@zjlib/element-plugins": {
-      "version": "1.1.1",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-1.1.1.tgz",
-      "integrity": "sha512-hobIdUjiYEaghdmlF7i2DPFCnpcperDasmmRZr6FZ99jJGRJEmigPKMOhUBnYKUBbi9b3e6h9IOzdPRmgSzXNg==",
+      "version": "1.1.2",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-1.1.2.tgz",
+      "integrity": "sha512-4HD1cqsnHVrWFxsXhbXapph01vBTa77R0BVMh8fWcZivPnt8g7aoSQ7ZE7AQuMYqBLKf73yTElD6xE6RnGqWUQ==",
       "requires": {
         "clipboard": "^2.0.11",
         "core-js": "^3.6.5",

package.json

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

src/views/finance/standbook_list.vue

@@ -903,22 +903,22 @@ export default {
         if (index === 0) {
           sums[index] = '合计'
         }
-        if (index === 7) {
+        if (index === 10) {
           sums[index] = this.computedFn(data, 1)
         }
-        if (index === 8) {
+        if (index === 11) {
           sums[index] = this.computedFn(data, 2)
         }
-        if (index === 9) {
+        if (index === 12) {
           sums[index] = this.computedFn(data, 3)
         }
-        if (index === 10) {
+        if (index === 13) {
           sums[index] = this.computedFn(data, 4)
         }
-        if (index === 11) {
+        if (index === 14) {
           sums[index] = this.computedFn(data, 5)
         }
-        if (index === 12) {
+        if (index === 15) {
           sums[index] = this.computedFn(data, 6)
         }
         // if (index === 13) {

src/views/sales_control/sales_management/components/customer_sales_form.vue

@@ -322,8 +322,8 @@ export default {
               if (this.isFront ===false){
                 this.$parent.pageType = 0
               }              this.salesId = res.data
-              this.$refs.header.screenForm.id = res.data
-                            this.$forceUpdate()
+              this.$set(this.$refs.header.screenForm,'id',res.data)
+              this.$forceUpdate()
             })
 
           } else {

src/views/supply/pickup/components/pickup_form.vue

@@ -100,7 +100,7 @@
                 <el-option
                   :label="item.logisticsCompany"
                   :value="item.id"
-                  :disabled="(isFront ===false && item.id === '1574563841707114498' ===false && item.id === '1574563841707114498')||(isFront ===true && item.id !== '1574563841707114498')"
+                  :disabled="comDisabled(item.id)"
                   v-for="(item, index) in companyList"
                   :key="index"
                 ></el-option>
@@ -353,7 +353,19 @@ export default {
         hideSidebar: !this.sidebar.opened,
         openSidebar: this.sidebar.opened
       }
+    },
+    comDisabled(){
+      return (id)=>{
+        if (this.isFront ===false && id === '1574563841707114498') {
+            return true
+        }
+        if (this.isFront ===true && id !== '1574563841707114498') {
+          return true
+        }
+        return false
+      }
     }
+
   },
 
   created() {
@@ -444,7 +456,8 @@ export default {
             pageNum: 1,
             pageSize: -1
           }).then(res => {
-            const item = res.data.records.find(k => k.id === this.mainForm.logisticsId)
+            this.companyList = res.data.records
+            const item = this.companyList.find(k => k.id === this.mainForm.logisticsId)
             this.mainForm.company = item.logisticsCompany
             this.logisticsNumber = item.logisticsNumber
             if (this.logisticsNumber === '001' && this.deliverList && this.deliverList.length) {