Merge branch 'dev_v2' into feat-two

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
-      for (var i = 0; i < pm.params.length; i++) {
+      var specification, customerId
+
+      for (let i = 0; i < pm.params.length; i++) {
         if (pm.params[i].param === 'specification') {
           specification = pm.params[i].value
-          pm.params.splice(i, 1)
-          break
+          pm.params.splice(i--, 1)
+        }
+        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,
@@ -230,12 +254,12 @@ export default {
     operation() {
       return (h, { row, index, column }) => {
         return (
-          <div class="operation-btns">
+          <div class='operation-btns'>
             {row.examineStatus == 'SAVE' ? (
               <el-button
-                size="mini"
-                type="text"
-                onClick={async () => {
+                size='mini'
+                type='text'
+                onClick={async() => {
                   this.isShow = 3
                   this.id = row.id
                 }}
@@ -247,9 +271,9 @@ export default {
             )}
 
             <el-button
-              size="mini"
-              type="text"
-              onClick={async () => {
+              size='mini'
+              type='text'
+              onClick={async() => {
                 this.isShow = 4
                 this.id = row.id
                 this.code = row.code
@@ -260,9 +284,9 @@ export default {
 
             {row.examineStatus == 'WAIT' && this.$checkBtnRole('examine', this.$route.meta.roles) ? (
               <el-button
-                size="mini"
-                type="text"
-                onClick={async () => {
+                size='mini'
+                type='text'
+                onClick={async() => {
                   this.isShow = 5
                   this.id = row.id
                   this.code = row.code
@@ -277,12 +301,12 @@ export default {
 
             {row.examineStatus == 'SAVE' ? (
               <el-popconfirm
-                onOnConfirm={async () => {
+                onOnConfirm={async() => {
                   this.handlesubmit(row)
                 }}
-                title="是否确定需要提审该项内容?"
+                title='是否确定需要提审该项内容?'
               >
-                <el-button slot="reference" size="mini" type="text">
+                <el-button slot='reference' size='mini' type='text'>
                   提审
                 </el-button>
               </el-popconfirm>
@@ -292,12 +316,12 @@ export default {
 
             {row.examineStatus == 'OK' && row.status ? (
               <el-popconfirm
-                onOnConfirm={async () => {
+                onOnConfirm={async() => {
                   this.handleNullify(row)
                 }}
-                title="是否确定需要作废该项内容?"
+                title='是否确定需要作废该项内容?'
               >
-                <el-button slot="reference" size="mini" type="text">
+                <el-button slot='reference' size='mini' type='text'>
                   作废
                 </el-button>
               </el-popconfirm>
@@ -307,12 +331,12 @@ export default {
 
             {row.examineStatus == 'OK' ? (
               <el-popconfirm
-                onOnConfirm={async () => {
+                onOnConfirm={async() => {
                   this.handleClone(row)
                 }}
-                title="是否确定需要克隆该项内容?"
+                title='是否确定需要克隆该项内容?'
               >
-                <el-button slot="reference" size="mini" type="text">
+                <el-button slot='reference' size='mini' type='text'>
                   克隆
                 </el-button>
               </el-popconfirm>
@@ -322,12 +346,12 @@ export default {
 
             {row.examineStatus != 'OK' ? (
               <el-popconfirm
-                onOnConfirm={async () => {
+                onOnConfirm={async() => {
                   this.hanleDelete(row.id)
                 }}
-                title="是否确定需要删除该项内容?"
+                title='是否确定需要删除该项内容?'
               >
-                <el-button slot="reference" size="mini" type="text">
+                <el-button slot='reference' size='mini' type='text'>
                   删除
                 </el-button>
               </el-popconfirm>
@@ -337,12 +361,12 @@ export default {
 
             {row.examineStatus == 'OK' ? (
               <el-popconfirm
-                onOnConfirm={async () => {
+                onOnConfirm={async() => {
                   this.hanleAbandon(row.id)
                 }}
-                title="是否确定需要弃审该项内容?"
+                title='是否确定需要弃审该项内容?'
               >
-                <el-button slot="reference" size="mini" type="text">
+                <el-button slot='reference' size='mini' type='text'>
                   弃审
                 </el-button>
               </el-popconfirm>

src/views/supply/engin/home_list.vue

@@ -102,10 +102,10 @@ export default {
     return {
       orderStatusParam: '',
       workerState: [
-        // {
-        //   label: '全部',
-        //   value: ''
-        // },
+        {
+          label: '全部',
+          value: ''
+        },
         // {
         //   label: '初审不通过',
         //   value: 'FAIL_ONE'
@@ -342,6 +342,13 @@ export default {
           params: [{ param: 'a.examine_status', compare: '=', value: this.orderStatusParam }, ...p[0].params]
         }
       }
+      try {
+        let res = await v2EnginOrderHomeCountList(params)
+        this.numSum.totalC = res.data.totalC
+        this.numSum.amountC = res.data.amountC
+      } catch (error) {
+        // console.log(error)
+      }
 
       return v2EnginOrderHomeList(params)
     },

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

@@ -73,15 +73,15 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-<!--        <el-col :span="24" :sm="12" :lg="12" >-->
-<!--          <el-form-item label="计划单" prop="isPlanOrder">-->
-<!--            <el-radio-group v-model="mainForm.isPlanOrder">-->
-<!--              <el-radio :label="true">是</el-radio>-->
-<!--              <el-radio :label="false">否</el-radio>-->
-<!--            </el-radio-group>-->
-<!--            <span style="color: #ff0000; margin-left: 20px">注：如需开直调单，请下计划单，不要下非计划单</span>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
+        <!--        <el-col :span="24" :sm="12" :lg="12" >-->
+        <!--          <el-form-item label="计划单" prop="isPlanOrder">-->
+        <!--            <el-radio-group v-model="mainForm.isPlanOrder">-->
+        <!--              <el-radio :label="true">是</el-radio>-->
+        <!--              <el-radio :label="false">否</el-radio>-->
+        <!--            </el-radio-group>-->
+        <!--            <span style="color: #ff0000; margin-left: 20px">注：如需开直调单，请下计划单，不要下非计划单</span>-->
+        <!--          </el-form-item>-->
+        <!--        </el-col>-->
       </el-row>
     </el-form>
 
@@ -323,7 +323,7 @@
       :close-on-click-modal="false"
       title="引用销售政策"
       @close="handleClose"
-    :append-to-body="true"
+      :append-to-body="true"
     >
       <template>
         <el-form ref="screenForm" :model="screenForm" label-width="120px" label-position="left" size="small">
@@ -856,7 +856,6 @@ export default {
           newValue.forEach((item, index) => {
             this.goodsList[index].policyConditionId = this.policyConditionId
             if (this.correspondId) {
-
               this.goodsList[index].correspondName = this.correspondName
               this.goodsList[index].correspondId = this.correspondId
             }
@@ -1053,7 +1052,6 @@ export default {
           this.screenForm.policyId = this.policyId
           if (this.listItem) {
             this.policyConditionId = data[0].id
-
           }
         } else {
           this.screenForm.policyId = data[0].policyId
@@ -1467,7 +1465,7 @@ export default {
 
         getDetail({ id: this.listItem.id }).then(res => {
           const data = res.data
-          console.log(data,99);
+          console.log(data, 99)
           this.mainForm.date = data.theTime
           this.mainForm.type = data.mainId
           this.mainForm.remark = data.remark
@@ -1510,7 +1508,7 @@ export default {
             })
           })
           this.goodsList = data.retailOrderItemList
-          console.log(this.goodsList);
+          console.log(this.goodsList)
         })
       })
     },
@@ -1714,7 +1712,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$refs.screenForm.resetFields()
+      this.$refs.screenForm.resetFields()
       this.currentPage = 1
       this.getGoodsList()
     },
@@ -1899,13 +1897,12 @@ export default {
             policyId: this.policyId,
             fileNo: this.mainForm.fileNum
           }
-          console.log(params,this.policyConditionId)
+          console.log(params, this.policyConditionId)
           if (this.listItem) {
             params.id = this.listItem.id
             editData(params).then(res => {
               this.$successMsg('编辑成功')
               this.goBack()
-             
             })
           } else {
             params.retailOrderItemList.forEach(k => {
@@ -1915,7 +1912,6 @@ export default {
             addData(params).then(res => {
               this.$successMsg('添加成功')
               this.goBack()
-             
             })
           }
         }