Merge branch 'feature/bug分支' into develop

package-lock.json

@@ -4267,9 +4267,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "@zjlib/element-plugins": {
-      "version": "2.3.0",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.3.0.tgz",
-      "integrity": "sha512-OqvXOTpe2ZbmMsMGy7cKES5lYrafXhIE0E0y1wL3TxHKMJQe/n0k8Jx0flnwA0BxgOFicjpgaLLt28EaasFSlA==",
+      "version": "2.3.4",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.3.4.tgz",
+      "integrity": "sha512-SoSsa+5+yyzHofNwWfWHW4diBqtkEfYXSB6H2FhQmknURAD45V/Kfq/HTJg+/TkWxtMTc/uLOwSasKBLHNTSnA==",
       "requires": {
         "@turf/turf": "^6.5.0",
         "@vuemap/vue-amap": "^0.1.12",

package.json

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

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

@@ -537,6 +537,8 @@ export default {
           ...this.parameter,
           pageSize: -1,
           params: querylist.map(item => {
+            item.param = item.param.replace(/>=/g, '')
+            item.param = item.param.replace(/<=/g, '')
             if (
               // item.compare === '=' &&
               typeof item.value == 'string' &&

src/views/sales_policy/policy_list.vue

@@ -1,36 +1,36 @@
 <template>
   <template-page
     ref="pageRef"
-    :getList="getList"
+    :get-list="getList"
     :operation="operation()"
-    :optionsEvensGroup="optionsEvensGroup"
-    :exportList="exportList"
-    :columnParsing="columnParsing"
-    :tableAttributes="tableAttributes"
-    :tableEvents="tableEvents"
-    :replaceOrNotMap="false"
-    :operationColumnWidth="200"
-    :fieldBeansHook="fieldBeansHook"
+    :options-evens-group="optionsEvensGroup"
+    :export-list="exportList"
+    :column-parsing="columnParsing"
+    :table-attributes="tableAttributes"
+    :table-events="tableEvents"
+    :replace-or-not-map="false"
+    :operation-column-width="200"
+    :field-beans-hook="fieldBeansHook"
   >
     <Popu v-if="isShow !== 1">
       <el-page-header slot="head" :content="content" @back="handleClose" />
       <AddPolicy
         v-if="isShow === 2"
+        :is-show="isShow"
+        :is-flag="isFlag"
         @close="handleClose"
         @upDataIsFlag="upDataIsFlag"
-        :isShow="isShow"
-        :isFlag="isFlag"
       />
       <EditPolicy
         v-if="isShow === 3"
         :id="id"
+        :is-show="isShow"
+        :is-flag="isFlag"
         @close="handleClose"
         @upDataIsFlag="upDataIsFlag"
-        :isShow="isShow"
-        :isFlag="isFlag"
       />
-      <Details v-if="isShow === 4" @close="handleClose" :id="id" :isShow="isShow" />
-      <Examine v-if="isShow === 5" @close="handleClose" :id="id" :isShow="isShow" />
+      <Details v-if="isShow === 4" :id="id" :is-show="isShow" @close="handleClose" />
+      <Examine v-if="isShow === 5" :id="id" :is-show="isShow" @close="handleClose" />
     </Popu>
   </template-page>
 </template>
@@ -191,21 +191,45 @@ export default {
           tbName: '',
           type: 'input',
           noUse: true
+        },
+        {
+          adminUserId: null,
+          colName: 'customer_id',
+          enumMap: '{}',
+          frontCode: 'CUSTOMER',
+          hide: false,
+          isCopy: false,
+          isQuery: true,
+          isShow: false,
+          isTotal: false,
+          jname: 'customerId',
+          label: '经销商',
+          multiple: false,
+          pk: false,
+          sortNum: 0,
+          tbName: '',
+          type: 'select',
+          noUse: true
         }
       ]
     },
     // 列表请求函数
     getList(p) {
       var pm = JSON.parse(JSON.stringify(p))
-      var specification
+      var specification, customerId
       for (var i = 0; i < pm.params.length; i++) {
         if (pm.params[i].param === 'specification') {
           specification = pm.params[i].value
           pm.params.splice(i, 1)
-          break
+
+        }
+        if (pm.params[i].param === 'customer_id') {
+          customerId = pm.params[i].value
+          pm.params.splice(i, 1)
+   
         }
       }
-      return policyListV2({ ...pm, specification })
+      return policyListV2({ ...pm, specification, customerId })
     },
     // 列表导出函数
     exportList: policyListV2Export,

src/views/supply/deliver/commerce_list.vue

@@ -194,7 +194,14 @@ export default {
       return invoiceListProjectV2(params)
     },
     // 列表导出函数
-    exportList: invoiceListProjectV2Export,
+    // exportList: invoiceListProjectV2Export,
+    exportList() {
+      let params = {
+        ...p[0],
+        orderType: 3
+      }
+      return invoiceListProjectV2Export(params)
+    },
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
       return defaultData

src/views/supply/deliver/home_list.vue

@@ -166,7 +166,14 @@ export default {
       return invoiceListProjectV2(params)
     },
     // 列表导出函数
-    exportList: invoiceListProjectV2Export,
+    // exportList: invoiceListProjectV2Export,
+    exportList(...p) {
+      let params = {
+        ...p[0],
+        orderType: 2
+      }
+      return invoiceListProjectV2Export(params)
+    },
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
       return defaultData

src/views/supply/policy/components/retail_form.vue

@@ -141,7 +141,6 @@
             <el-input v-model="scope.row.qty" class="yinput" size="small" />
           </template>
         </el-table-column>
-        <el-table-column align="right" label="退订数量" prop="" min-width="100" show-overflow-tooltip />
         <el-table-column align="right" label="订单金额" min-width="100" prop="compute_amount" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ (scope.row.price * scope.row.qty) | numToFixed }}