Merge branch 'dev_v2'

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)
+          break
+        }
       }
-      return policyListV2({ ...pm, specification })
+      return policyListV2({ ...pm, specification, customerId })
     },
     // 列表导出函数
     exportList: policyListV2Export,