Merge branch 'dev_v2' of ssh://gogs.zfire.top:2222/zfire-front/supply-front into dev_v2

src/api/supply/implement.js

@@ -38,6 +38,25 @@ export function retailExecPolicyListV2Export(data, name) {
   })
 }
 
+// 销售执行明细列表-政策零售订单-V2
+export function retailExecEnginListV2(data) {
+  return request({
+    url: `/retail/exec/engin/list/v2?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
+  })
+}
+
+//销售执行明细列表-政策零售订单-V2-导出
+export function retailExecEnginListV2Export(data, name) {
+  return postBlob({
+    url: '/retail/exec/engin/export/v2',
+    method: 'post',
+    data,
+    name
+  })
+}
+
 // 获取列表
 export function getList(params) {
   return request({

src/api/supply/pickup.js

@@ -9,6 +9,7 @@ export function pickListV2(data) {
   })
 }
 
+
 //提货-列表V2导出
 export function pickListV2Export(data, name) {
   return postBlob({
@@ -19,6 +20,13 @@ export function pickListV2Export(data, name) {
   })
 }
 
+export function getListInvoiceNumberV2(data) {
+  return request({
+    url: `/invoice/listInvoiceNumberV2?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
+  })
+}
 // 获取列表
 export function getPickupList(params) {
   return request({

src/layout/components/Navbar.vue

@@ -729,6 +729,7 @@ export default {
 
 <style lang="scss" scoped>
 @import '~@/styles/variables.scss';
+.right-menu-item{
 ::v-deep .el-input__inner {
   width: 80px;
   font-size: 16px;
@@ -736,6 +737,8 @@ export default {
   color: #333333;
   border: 0 !important;
 }
+}
+
 ::v-deep .is-fixed {
   right: 10px !important;
 }

src/views/dashboard.vue

@@ -217,16 +217,35 @@
         </div>
         <!-- 到货通知 -->
         <div v-show="type == '5'" class="table">
-          <el-table
-            ref="table"
+          <div class="mymain-container">
+        <el-form ref="form"  label-width="80px" label-position="left" size="mini">
+          <el-row>
+            <el-col>
+              <el-form-item prop="specification" label="规格型号">
+                <div style="display: flex">
+                  <el-input v-model="specification" clearable style="margin-right: 10px" />
+                  <el-button
+                    @click="
+                      specification = ''
+                      getListInvoiceOrder()
+                    "
+                    >重置</el-button
+                  >
+                  <el-button type="primary" @click="getListInvoiceOrder">查询</el-button>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div class="table">
+          <el-table    ref="table"
             v-loading="listLoading"
             :data="arrivalNoticeList"
             element-loading-text="Loading"
             border
             fit
             highlight-current-row
-            stripe
-          >
+            stripe>
             <el-table-column
               property="materialOldNumber"
               align="left"
@@ -265,6 +284,8 @@
             />
           </el-table>
         </div>
+      </div>
+        </div>
         <br />
         <br />
         <!-- 分页 -->
@@ -414,7 +435,8 @@ export default {
       visible: false,
       orderId: '',
       logisticsDetail: [],
-      arrivalNoticeList:[]
+      arrivalNoticeList:[],
+      specification:''
     }
   },
 
@@ -584,6 +606,7 @@ export default {
     },
     // 获取返利确认单数据
     async getRebateList(data) {
+    
       const res = await getRebateOrderList(data)
       this.rebateList = res.data.records
       this.listTotal = res.data.total
@@ -597,6 +620,12 @@ export default {
     },
     // 获取物流列表
     async getListInvoiceOrder(data) {
+      data = {
+        ...data,
+        pageSize: this.pageSize,
+        pageNum: this.currentPage,
+        specification:this.specification
+      }
       const res = await getListInvoiceOrder(data)
       this.invoiceOrderList = res.data.records
       this.listTotal = res.data.total
@@ -652,9 +681,9 @@ export default {
     // 点击菜单
     clickMenu(path) {
       const curlArr = ['/notice', '/issue']
-      if (curlArr.includes(path)) {
-        path += '/index'
-      }
+      // if (curlArr.includes(path)) {
+      //   path += '/index'
+      // }
       this.$router.push({
         path
       })
@@ -680,6 +709,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+::v-deep  .el-input__inner {
+    /* width: 80px; */
+    font-size: 16px;
+    color: #333333;
+    /* border: 0 !important; */
+}
 .dashboard {
   &-container {
     background: #f5f5f5;

src/views/supply/deliver/sum_list.vue

@@ -230,7 +230,7 @@ export default {
     // 列表请求函数
     getList(...p) {
       this.recordSelected = []
-      getListInvoiceNumberV2({ ...p }).then(res => {
+      getListInvoiceNumberV2( ...p ).then(res => {
         this.totalNum = res.data
       })
       return getSumListV2(...p)

src/views/supply/implement/implement_list.vue

@@ -32,7 +32,9 @@ import {
   retailExecRetailV2,
   retailExecRetailV2Export,
   retailExecPolicyListV2,
-  retailExecPolicyListV2Export
+  retailExecPolicyListV2Export,
+  retailExecEnginListV2,
+  retailExecEnginListV2Export
 } from '@/api/supply/implement'
 import { getCategoryList } from '@/api/common'
 import DisplaceDetail from '@/views/supply/implement/components/displace_detail'
@@ -160,16 +162,44 @@ export default {
       if (this.radioType === '零售订单') {
         return retailExecRetailV2(...p)
       }
+      if (this.radioType === '家用工程订单') {
+        let params = {
+          ...p[0],
+          enginOrderType: 'HOME'
+        }
+        return retailExecEnginListV2(params)
+      }
+      if (this.radioType === '商用工程订单') {
+        let params = {
+          ...p[0],
+          enginOrderType: 'TRADE'
+        }
+        return retailExecEnginListV2(params)
+      }
     },
 
     // 列表导出函数
-    exportList() {
+    exportList(...p) {
       if (this.radioType === '政策零售订单') {
         return retailExecPolicyListV2Export()
       }
       if (this.radioType === '零售订单') {
         return retailExecRetailV2Export()
       }
+      if (this.radioType === '家用工程订单') {
+        let params = {
+          ...p[0],
+          enginOrderType: 'HOME'
+        }
+        return retailExecEnginListV2Export(params)
+      }
+      if (this.radioType === '商用工程订单') {
+        let params = {
+          ...p[0],
+          enginOrderType: 'TRADE'
+        }
+        return retailExecEnginListV2Export(params)
+      }
     },
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {

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

@@ -323,6 +323,7 @@
       :close-on-click-modal="false"
       title="引用销售政策"
       @close="handleClose"
+    :append-to-body="true"
     >
       <template>
         <el-form ref="screenForm" :model="screenForm" label-width="120px" label-position="left" size="small">

src/views/supply/policy/policy_list.vue

@@ -6,6 +6,8 @@
     :operation="operation()"
     :optionsEvensGroup="optionsEvensGroup"
     :columnParsing="columnParsing"
+    :tableEvents="tableEvents"
+    :tableAttributes="tableAttributes"
   >
     <Popu v-if="isShowDetail || isShowForm || isShowExamine || isShowReturn">
       <RetailDetail v-if="isShowDetail" :list-item="queryItem" @backListFormDetail="backList" />
@@ -76,9 +78,9 @@ export default {
           [
             {
               name: '批量审批',
-              click: this.addOn(() => {
+              click: ()=>{
                 this.batchExamine()
-              }),
+              },
               isRole: this.$checkBtnRole('examine', this.$route.meta.roles)
             }
           ]
@@ -181,21 +183,22 @@ export default {
     },
     operation() {
       return (h, { row, index, column }) => {
+        const statusData = JSON.parse("{\"FAIL_ONE\":\"初审不通过\",\"REJECT\":\"驳回\",\"OK_ONE_AND_CONFIRM\":\"已确认未复核\",\"ABANDON\":\"弃审\",\"SAVE\":\"保存\",\"CLOSE\":\"关闭\",\"OK\":\"审核通过\",\"WAIT\":\"待审核\",\"FAIL\":\"审核不通过\",\"OK_ONE\":\"初审通过\"}")
         return (
           <div class="operation-btns">
-            {row.examineStatus === 'SAVE' ? (
+            {row.examineStatus === statusData['SAVE'] ? (
               <el-popconfirm style="margin-left: 10px" title="确定提审？" onOnConfirm={() => this.handleSubmit(row.id)}>
                 <el-button slot="reference" type="text">
                   提审
                 </el-button>
               </el-popconfirm>
             ) : null}
-            {row.examineStatus == 'WAIT' && this.$checkBtnRole('examine', this.$route.meta.roles) ? (
+            {row.examineStatus ==statusData['WAIT'] && this.$checkBtnRole('examine', this.$route.meta.roles) ? (
               <el-button style="margin-left: 10px" type="text" onClick={() => this.toExamine(row)}>
                 审核
               </el-button>
             ) : null}
-            {this.$checkBtnRole('del', this.$route.meta.roles) && row.examineStatus === 'SAVE' ? (
+            {this.$checkBtnRole('del', this.$route.meta.roles) && row.examineStatus === statusData['SAVE'] ? (
               <el-popconfirm
                 style="margin-left: 10px"
                 title="确定删除吗？"
@@ -206,12 +209,12 @@ export default {
                 </el-button>
               </el-popconfirm>
             ) : null}
-            {row.examineStatus === 'SAVE' && this.$checkBtnRole('edit', this.$route.meta.roles) ? (
+            {row.examineStatus === statusData['SAVE'] && this.$checkBtnRole('edit', this.$route.meta.roles) ? (
               <el-button style="margin-left: 10px" type="text" onClick="toForm(row)">
                 编辑
               </el-button>
             ) : null}
-            {this.$checkBtnRole('examine', this.$route.meta.roles) && row.examineStatus === 'OK' ? (
+            {this.$checkBtnRole('examine', this.$route.meta.roles) && row.examineStatus === statusData['OK'] ? (
               <el-popconfirm
                 style="margin-left: 10px"
                 title="确定弃审吗？"
@@ -222,7 +225,7 @@ export default {
                 </el-button>
               </el-popconfirm>
             ) : null}
-            {row.examineStatus == 'WAIT' && this.$checkBtnRole('apply', this.$route.meta.roles) ? (
+            {row.examineStatus == statusData['WAIT'] && this.$checkBtnRole('apply', this.$route.meta.roles) ? (
               <el-popconfirm style="margin-left: 10px" title="确定撤回？" onOnConfirm={() => this.handleCancel(row.id)}>
                 <el-button slot="reference" type="text">
                   撤回
@@ -233,12 +236,12 @@ export default {
               详情
             </el-button>
 
-            {row.examineStatus === 'OK' && this.$checkBtnRole('examine', this.$route.meta.roles) ? (
+            {row.examineStatus === statusData['OK'] && this.$checkBtnRole('examine', this.$route.meta.roles) ? (
               <el-button style="margin-left: 10px" type="text" onClick={() => this.toReturn(row)}>
                 退订
               </el-button>
             ) : null}
-            {row.examineStatus === 'SAVE' && this.$checkBtnRole('examine', this.$route.meta.roles) ? (
+            {row.examineStatus === statusData['SAVE'] && this.$checkBtnRole('examine', this.$route.meta.roles) ? (
               <el-popconfirm
                 style="margin-left: 10px"
                 title="确定关闭吗？"

src/views/supply/retail/retail_list.vue

@@ -134,9 +134,13 @@ export default {
     },
     operation() {
       return (h, { row, index, column }) => {
+        const statusData = JSON.parse(
+          '{"FAIL_ONE":"初审不通过","REJECT":"驳回","OK_ONE_AND_CONFIRM":"已确认未复核","ABANDON":"弃审","SAVE":"保存","CLOSE":"关闭","OK":"审核通过","WAIT":"待审核","FAIL":"审核不通过","OK_ONE":"初审通过"}'
+        )
+
         return (
           <div class="operation-btns">
-            {this.$checkBtnRole('apply', this.$route.meta.roles) && row.examineStatus === 'SAVE' ? (
+            {this.$checkBtnRole('apply', this.$route.meta.roles) && row.examineStatus === statusData['SAVE'] ? (
               <el-popconfirm
                 style="margin-right: 10px"
                 title="确定申请吗？"
@@ -148,7 +152,7 @@ export default {
               </el-popconfirm>
             ) : null}
 
-            {this.$checkBtnRole('apply', this.$route.meta.roles) && row.examineStatus === 'WAIT' ? (
+            {this.$checkBtnRole('apply', this.$route.meta.roles) && row.examineStatus === statusData['WAIT'] ? (
               <el-popconfirm
                 style="margin-right: 10px"
                 title="确定撤回吗？"
@@ -159,7 +163,7 @@ export default {
                 </el-button>
               </el-popconfirm>
             ) : null}
-            {this.$checkBtnRole('examine', this.$route.meta.roles) && row.examineStatus === 'OK' ? (
+            {this.$checkBtnRole('examine', this.$route.meta.roles) && row.examineStatus === statusData['OK'] ? (
               <el-popconfirm
                 style="margin-right: 10px"
                 title="确定弃审吗？"
@@ -172,7 +176,7 @@ export default {
             ) : null}
             {this.$checkBtnRole('examine', this.$route.meta.roles) &&
             !row.closeTime &&
-            (row.examineStatus === 'SAVE' || row.examineStatus === 'WAIT') ? (
+            (row.examineStatus === statusData['SAVE'] || row.examineStatus === statusData['WAIT']) ? (
               <el-popconfirm
                 style="margin-right: 10px"
                 title="确定关闭吗？"
@@ -183,7 +187,7 @@ export default {
                 </el-button>
               </el-popconfirm>
             ) : null}
-            {this.$checkBtnRole('del', this.$route.meta.roles) && row.examineStatus === 'SAVE' ? (
+            {this.$checkBtnRole('del', this.$route.meta.roles) && row.examineStatus === statusData['SAVE'] ? (
               <el-popconfirm
                 style="margin-right: 10px"
                 title="确定删除吗？"
@@ -194,17 +198,17 @@ export default {
                 </el-button>
               </el-popconfirm>
             ) : null}
-            {this.$checkBtnRole('examine', this.$route.meta.roles) && row.examineStatus === 'WAIT' ? (
+            {this.$checkBtnRole('examine', this.$route.meta.roles) && row.examineStatus === statusData['WAIT'] ? (
               <el-button type="text" onClick={() => this.toExamine(row)}>
                 审批
               </el-button>
             ) : null}
-            {this.$checkBtnRole('edit', this.$route.meta.roles) && row.examineStatus === 'SAVE' ? (
+            {this.$checkBtnRole('edit', this.$route.meta.roles) && row.examineStatus === statusData['SAVE'] ? (
               <el-button type="text" onClick={() => toForm(row)}>
                 编辑
               </el-button>
             ) : null}
-            {this.$checkBtnRole('examine', this.$route.meta.roles) && row.examineStatus === 'OK' ? (
+            {this.$checkBtnRole('examine', this.$route.meta.roles) && row.examineStatus === statusData['OK'] ? (
               <el-button type="text" onClick={() => this.toReturn(row)}>
                 退订
               </el-button>