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

src/api/supply/sales.js

@@ -19,8 +19,6 @@ export function saleOrderListV2Export(data, name) {
   })
 }
 
-
-
 export function getSaleOrderListV2(data) {
   return request({
     url: `/sale/order/listV2?moduleId=${data.moduleId}`,
@@ -29,6 +27,13 @@ export function getSaleOrderListV2(data) {
   })
 }
 
+export function getSaleOrderListV3(data) {
+  return request({
+    url: `/sale/order/listV3?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
+  })
+}
 
 export function exportSaleOrderListV2(data, name) {
   return postBlob({
@@ -39,7 +44,6 @@ export function exportSaleOrderListV2(data, name) {
   })
 }
 
-
 // 获取列表
 export function getList(params) {
   return request({

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

@@ -431,7 +431,9 @@ export default {
               this.setDefaultPlan(`${item.tbName ? item.tbName + '.' : ''}${item.colName}`)
             }
             if (item.pk) {
-              this.pk = item.colName
+              this.$nextTick(() => {
+                this.pk = item.colName
+              })
             }
             if (item.frontCode && !~this.frontCodes.indexOf(item.frontCode)) {
               this.frontCodes.push(item.frontCode)

src/views/basic_data/taker/taker_list.vue

@@ -9,6 +9,7 @@
     :tableAttributes="tableAttributes"
     :tableEvents="tableEvents"
     :operationColumnWidth="200"
+    :replaceOrNotMap="false"
   >
     <!-- 弹窗 -->
     <el-dialog

src/views/dashboard.vue

@@ -1,6 +1,6 @@
 <template>
   <popu>
-    <div >
+    <div>
       <div class="menu-list">
         <div>
           <div class="main-title">
@@ -35,14 +35,16 @@
             </div>
             <div v-else class="child">
               <div class="item">
-                <el-link class="link" :underline="false" @click="clickMenu(item.fullUrl)">{{ item.moduleName }}</el-link>
+                <el-link class="link" :underline="false" @click="clickMenu(item.fullUrl)">{{
+                  item.moduleName
+                }}</el-link>
               </div>
             </div>
           </div>
         </div>
       </div>
       <!-- 弹窗 -->
-      <el-dialog title="菜单配置" :visible.sync="dialogVisible" width="70%">
+      <el-dialog title="菜单配置" append-to-body :visible.sync="dialogVisible" width="70%">
         <el-checkbox-group v-model="checkList" :max="10">
           <div v-for="(item, index) in menuList" :key="index" class="group">
             <div v-if="item.moduleName != '首页'">
@@ -218,73 +220,81 @@
         <!-- 到货通知 -->
         <div v-show="type == '5'" class="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>
-            <el-table-column
-              property="materialOldNumber"
-              align="left"
-              min-width="120"
-              label="产品编号"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              property="materialNumber"
-              align="left"
-              min-width="100"
-              label="物料编码"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              property="materialName"
-              align="left"
-              min-width="250"
-              label="产品名称"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              property="specification"
-              align="left"
-              min-width="350"
-              label="规格型号"
-              show-overflow-tooltip
-            />
-            <el-table-column property="stockName" align="left" min-width="100" label="到货仓库" show-overflow-tooltip />
-            <el-table-column
-              property="updateTime"
-              align="left"
-              min-width="200"
-              label="到货通知时间"
-              show-overflow-tooltip
-            />
-          </el-table>
-        </div>
-      </div>
+            <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
+              >
+                <el-table-column
+                  property="materialOldNumber"
+                  align="left"
+                  min-width="120"
+                  label="产品编号"
+                  show-overflow-tooltip
+                />
+                <el-table-column
+                  property="materialNumber"
+                  align="left"
+                  min-width="100"
+                  label="物料编码"
+                  show-overflow-tooltip
+                />
+                <el-table-column
+                  property="materialName"
+                  align="left"
+                  min-width="250"
+                  label="产品名称"
+                  show-overflow-tooltip
+                />
+                <el-table-column
+                  property="specification"
+                  align="left"
+                  min-width="350"
+                  label="规格型号"
+                  show-overflow-tooltip
+                />
+                <el-table-column
+                  property="stockName"
+                  align="left"
+                  min-width="100"
+                  label="到货仓库"
+                  show-overflow-tooltip
+                />
+                <el-table-column
+                  property="updateTime"
+                  align="left"
+                  min-width="200"
+                  label="到货通知时间"
+                  show-overflow-tooltip
+                />
+              </el-table>
+            </div>
+          </div>
         </div>
         <br />
         <br />
@@ -435,8 +445,8 @@ export default {
       visible: false,
       orderId: '',
       logisticsDetail: [],
-      arrivalNoticeList:[],
-      specification:''
+      arrivalNoticeList: [],
+      specification: ''
     }
   },
 
@@ -606,7 +616,6 @@ export default {
     },
     // 获取返利确认单数据
     async getRebateList(data) {
-    
       const res = await getRebateOrderList(data)
       this.rebateList = res.data.records
       this.listTotal = res.data.total
@@ -624,7 +633,7 @@ export default {
         ...data,
         pageSize: this.pageSize,
         pageNum: this.currentPage,
-        specification:this.specification
+        specification: this.specification
       }
       const res = await getListInvoiceOrder(data)
       this.invoiceOrderList = res.data.records
@@ -709,11 +718,11 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-::v-deep  .el-input__inner {
-    /* width: 80px; */
-    font-size: 16px;
-    color: #333333;
-    /* border: 0 !important; */
+::v-deep .el-input__inner {
+  /* width: 80px; */
+  font-size: 16px;
+  color: #333333;
+  /* border: 0 !important; */
 }
 .dashboard {
   &-container {

src/views/deposit_home/refund_list.vue

@@ -212,12 +212,16 @@ export default {
           [
             {
               name: '',
-              isRole: !this.$checkBtnRole('examine', this.$route.meta.roles),
+              isRole: this.$checkBtnRole('examine', this.$route.meta.roles),
               render: () => {
                 return (
                   <el-popconfirm
                     title="批量审核吗？"
                     onOnConfirm={() => {
+                      if (!this.selectData.length) {
+                        this.$errorMsg('请选择')
+                        return
+                      }
                       this.batchExamine()
                     }}
                   >

src/views/finance/components/receivable_list-add.vue

@@ -261,7 +261,7 @@
     </div>
 
     <!-- 提示 -->
-    <el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
+    <el-dialog title="提示" append-to-body :visible.sync="dialogVisible" width="30%">
       <ul class="ulStyle" v-for="(v, i) in messageList" :key="i">
         <li>{{ v }},现金钱包余额不足,请确认是否继续提交此单据</li>
       </ul>
@@ -399,8 +399,7 @@ export default {
       const res = await getFinanceOtherReceList({ pageSize: 1, pageNum: 1 })
       await getFinanceOtherReceApply({ id: res.data.records[0].id })
       this.$message.success('提审成功')
-      this.$emit('updateList')
-      this.$parent.showPage = 1
+      this.goBack()
       this.resetFn()
     },
     // // 不含税金额改变事件
@@ -496,8 +495,8 @@ export default {
         const res = await getFinanceOtherReceList({ pageSize: 1, pageNum: 1 })
         await getFinanceOtherReceApply({ id: res.data.records[0].id })
         this.$message.success('提审成功')
-        this.goBack()
         this.resetFn()
+        this.goBack()
       }
     },
     //选择经销商名称事件

src/views/finance/components/receivable_list-approval.vue

@@ -252,9 +252,8 @@ export default {
         examineRemark: this.examineRemark,
         examineStatus: this.examineStatus
       })
-      this.$emit('updateList')
-      this.$parent.showPage = 1
       this.$message.success('审核成功')
+      this.goBack()
     },
     async getDataList() {
       const res = await getFinanceOtherReceDetail({ id: this.approvalId })

src/views/finance/components/receivable_list-detail.vue

@@ -387,7 +387,8 @@ export default {
         code: this.searchForm.code
       })
       this.$message.success('编辑成功')
-      this.$parent.showPage = 1
+      // this.$parent.showPage = 1
+      this.goBack()
     },
     //选择经销商名称事件
     async changeCustomerFn(v, index) {

src/views/finance/receivable_list.vue

@@ -164,8 +164,8 @@ export default {
                 打印
               </el-button>
             ) : null}
-            {row.examineStatus == 'WAIT' ||
-            (row.examineStatus == 'FAIL' && this.$checkBtnRole('examine', this.$route.meta.roles)) ? (
+            {(row.examineStatus == 'WAIT' || row.examineStatus == 'FAIL') &&
+            this.$checkBtnRole('examine', this.$route.meta.roles) ? (
               <el-button type="text" onClick={() => this.approvalFn(row.id)}>
                 审批
               </el-button>
@@ -199,7 +199,6 @@ export default {
         this.showPage = 1
       })()
       this.$refs.pageRef.refreshList()
-
     },
     //获取经销商列表
     async getCustomerDataList() {

src/views/supply/deliver/components/design/preview.vue

@@ -1,6 +1,7 @@
 <template>
   <el-dialog
     class="sub-main"
+    append-to-body
     :visible.sync="visible"
     :show-close="false"
     :mask-closable="false"

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

@@ -14,7 +14,9 @@
       </div>
 
       <div class="main-title">
-        <div class="title">订单信息 <span style="margin-left: 20px">经销商名称：{{detailData.customerName}}</span></div>
+        <div class="title">
+          订单信息 <span style="margin-left: 20px">经销商名称：{{ detailData.customerName }}</span>
+        </div>
       </div>
 
       <div class="diy-table-1">
@@ -254,7 +256,7 @@
         <el-button @click="goBack">返回列表</el-button>
       </div>
     </div>
-    <el-dialog title="直接调拨单（提前开票）" :visible.sync="isShowDirectDialog" width="80%">
+    <el-dialog title="直接调拨单（提前开票）" append-to-body :visible.sync="isShowDirectDialog" width="80%">
       <el-form
         ref="directForm"
         :model="directForm"
@@ -377,7 +379,7 @@
         <el-button type="primary" @click="submitDirectForm">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="直调发货" :visible.sync="isShowDeliverDialog" width="80%">
+    <el-dialog title="直调发货" append-to-body :visible.sync="isShowDeliverDialog" width="80%">
       <el-form
         ref="deliverForm"
         :model="deliverForm"

src/views/supply/policy/policy_list.vue

@@ -9,7 +9,7 @@
     :tableEvents="tableEvents"
     :tableAttributes="tableAttributes"
   >
-    <ExamineDialog :isShow.sync="isShowExamineDialog" :examineForm.sync="examineForm" @submit="submitExamineForm"/>
+    <ExamineDialog :isShow.sync="isShowExamineDialog" :examineForm.sync="examineForm" @submit="submitExamineForm" />
     <EditDateDialog :is-show.sync="isShowEditDateDialog" :date-form.sync="dateForm" />
 
     <Popu v-if="isShowDetail || isShowForm || isShowExamine || isShowReturn">

src/views/supply/sales/sales_list.vue

@@ -31,7 +31,7 @@ import {
   getList,
   getWarehouseList,
   getListOrderNo,
-  getSaleOrderListV2,
+  getSaleOrderListV3,
   exportSaleOrderListV2
 } from '@/api/supply/sales'
 import SalesDetail from '@/views/supply/sales/components/sales_detail'
@@ -168,7 +168,7 @@ export default {
     // 列表请求函数
     getList(...p) {
       this.recordSelected = []
-      return getSaleOrderListV2(...p)
+      return getSaleOrderListV3(...p)
     },
     // 列表导出函数
     exportList: exportSaleOrderListV2,