Merge branch 'master_bug' into develop

package-lock.json

@@ -9,7 +9,7 @@
       "version": "4.4.0",
       "license": "MIT",
       "dependencies": {
-        "@zjlib/element-plugins": "^1.1.0",
+        "@zjlib/element-plugins": "^1.1.1",
         "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.0",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-1.1.0.tgz",
-      "integrity": "sha512-dkmJDNTyb6D2SDeJzd0vGr/h+miGSuLdy5gt+UxnqG3IRI7zV1eng6Bgrb8ZdFO5Hvz+ugEPhEfi9EXYSBHRHw==",
+      "version": "1.1.1",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-1.1.1.tgz",
+      "integrity": "sha512-hobIdUjiYEaghdmlF7i2DPFCnpcperDasmmRZr6FZ99jJGRJEmigPKMOhUBnYKUBbi9b3e6h9IOzdPRmgSzXNg==",
       "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.0",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-1.1.0.tgz",
-      "integrity": "sha512-dkmJDNTyb6D2SDeJzd0vGr/h+miGSuLdy5gt+UxnqG3IRI7zV1eng6Bgrb8ZdFO5Hvz+ugEPhEfi9EXYSBHRHw==",
+      "version": "1.1.1",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-1.1.1.tgz",
+      "integrity": "sha512-hobIdUjiYEaghdmlF7i2DPFCnpcperDasmmRZr6FZ99jJGRJEmigPKMOhUBnYKUBbi9b3e6h9IOzdPRmgSzXNg==",
       "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.0",
+    "@zjlib/element-plugins": "^1.1.1",
     "axios": "0.18.1",
     "clipboard": "^2.0.8",
     "concurrent-tasks": "^1.0.7",

src/components/template/template-page-1.vue

@@ -5,6 +5,7 @@
     :table-events="{ ...defaultTableEvents, ...tableEvents }" :column-parsing="columnParsing" :reduction="reduction"
     :plan="[...plan, ...morePlan]" :operation="operation" :operation-column-width="operationColumnWidth"
     :show-table="showTable" :code-gather="codeGather" @columnWidthChange="columnWidthChange"
+    :lowerLine="true"
     @columnListChange="columnListChange">
     <sel-export-column-list :column-list="columnList" @determine="exportDetermine" @cancel="columnList = []" />
     <slot />

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

@@ -5,7 +5,11 @@
     <sales-table :dataList="dataList" :column="column" @handleSelection="handleSelection">
 
 
-
+      <template #events>
+        <el-button v-if="details.status==1 && isFront!==false" type="primary" size="mini" @click="handleInform(2)">通知退货</el-button>
+        <!-- <el-button v-if="details.status==2 && isFront!==false" size="mini">撤销退货</el-button> -->
+       
+      </template>
 
 <!--      <template v-slot:operation="{item:{row,$index}}">-->
 <!--        <el-popconfirm-->

src/views/supply/engin/home_list.vue

@@ -9,7 +9,7 @@
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
           </template>
           <template #left_btn>
-            <el-checkbox-group v-model="screenForm.status" @change="getList()" size="mini">
+            <el-checkbox-group v-model="screenForm.status" @change="currentPage = 1;getList()" size="mini">
               <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
                 item.label
               }}</el-checkbox-button>

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'"
+                  :disabled="(isFront ===false && item.id === '1574563841707114498' ===false && item.id === '1574563841707114498')||(isFront ===true && item.id !== '1574563841707114498')"
                   v-for="(item, index) in companyList"
                   :key="index"
                 ></el-option>
@@ -444,8 +444,7 @@ export default {
             pageNum: 1,
             pageSize: -1
           }).then(res => {
-            this.companyList = res.data.records
-            const item = this.companyList.find(k => k.id === this.mainForm.logisticsId)
+            const item = res.data.records.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) {