Merge tag 'Hotfix-zh-107' into develop

Finish Hotfix-zh-107

src/views/basic_data/material/price_list.vue

@@ -352,11 +352,19 @@
             align="center"
           >
             <template slot-scope="scope">
-              <el-button
-                type="text"
-                size="mini"
+              <el-popconfirm
+                v-if="!scope.row.isRevoke"
+                style="margin-right: 10px"
+                title="作废吗？"
                 @click="handleRevoke(scope.row.id)"
-              >作废</el-button>
+              >
+                <el-button
+                  slot="reference"
+                  type="text"
+                  size="mini"
+                >作废</el-button>
+              </el-popconfirm>
+
               <el-button
                 v-if="$checkBtnRole('del', $route.meta.roles)"
                 type="text"

src/views/finance/standbook_list.vue

@@ -312,14 +312,9 @@
 
 <script>
 // import { mapGetters } from "vuex";
-import { getWalletCustomerList } from "@/api/finance/change_apply";
-import {
-  getStandbookList,
-  getDictList,
-  getCustomerList,
-  getAmountCount,
-} from "@/api/finance/standbook_list";
-import { numToFixed } from "@/filters";
+import { getWalletCustomerList } from '@/api/finance/change_apply'
+import { getAmountCount, getCustomerList, getStandbookList } from '@/api/finance/standbook_list'
+import { numToFixed } from '@/filters'
 
 export default {
   data() {
@@ -453,8 +448,18 @@ export default {
       }
     });
   },
+  activated() {
 
+    // 钱包余额页跳转过来
+    if (this.$route.query && this.$route.query.status){
+      console.log('jdkfjak')
+      this.bill = this.$route.query.status
+      this.changeFn(this.bill)
+    }
+
+  },
   created() {
+
     // console.log(
     //   this.customerId,
     //   this.$store.state.user.customerName,

src/views/finance/wallet.vue

@@ -1,18 +1,17 @@
 <template>
   <div class="app-container">
-    <div class="sty" v-show="show">
-      <el-page-header @back="goBack"> </el-page-header>
+    <div v-show="show" class="sty">
+      <el-page-header @back="goBack" />
     </div>
-    <br />
+    <br>
     <!-- 筛选条件 -->
     <div v-if="show2">
       <el-form ref="searchForm" :model="searchForm" :rules="rulesSearchForm" label-width="100px" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="经销商名称" prop="customerId">
-              <el-select class="selectStyle" v-model="searchForm.customerId" placeholder="请选择" filterable>
-                <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.id">
-                </el-option>
+              <el-select v-model="searchForm.customerId" class="selectStyle" placeholder="请选择" filterable>
+                <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -44,52 +43,54 @@
         </div>
       </el-col> -->
     </el-row>
-    <el-divider></el-divider>
+    <el-divider />
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
-        <el-table v-loading="listLoading" :data="walletList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
-          <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerName" />
-              <span>{{scope.row.customerName}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="钱包" prop="name" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="更新时间" prop="updateTime" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="余额" prop="amount" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.amount | numToFixed }}
-            </template>
-          </el-table-column>
-          <el-table-column align="right" label="可用信用额度" prop="freeCreditAmount" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.freeCreditAmount | numToFixed }}
-            </template>
-          </el-table-column>
-          <el-table-column align="right" label="已用信用额度" prop="usedCreditAmount" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.usedCreditAmount | numToFixed }}
-            </template>
-          </el-table-column>
+        <el-table v-loading="listLoading" @row-dblclick="$router.push('/finance/details/standbook_list?status=COMMONLY')" :data="walletList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
+          <template>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copy-text="scope.row.customerName" />
+                <span>{{ scope.row.customerName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="钱包" prop="name" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="更新时间" prop="updateTime" min-width="160" show-overflow-tooltip />
+            <el-table-column align="right" label="余额" prop="amount" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.amount | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="可用信用额度" prop="freeCreditAmount" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.freeCreditAmount | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="已用信用额度" prop="usedCreditAmount" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.usedCreditAmount | numToFixed }}
+              </template>
+            </el-table-column>
+          </template>
 
         </el-table>
       </div>
     </div>
     <span>返利钱包</span>
-    <el-divider></el-divider>
+    <el-divider />
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
-        <el-table v-loading="listLoading" :data="rebateList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
+        <el-table v-loading="listLoading" :data="rebateList" @row-dblclick="$router.push('/finance/details/standbook_list?status=REBATE')" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
           <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerName" />
-              <span>{{scope.row.customerName}}</span>
+              <CopyButton :copy-text="scope.row.customerName" />
+              <span>{{ scope.row.customerName }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="left" label="返利钱包" prop="name" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="更新时间" prop="updateTime" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="返利钱包" prop="name" min-width="160" show-overflow-tooltip />
+          <el-table-column align="left" label="更新时间" prop="updateTime" min-width="160" show-overflow-tooltip />
 
           <el-table-column align="right" label="钱包余额" prop="amount" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -120,7 +121,7 @@
     <el-dialog title="配置返利比例" :visible.sync="dialogForm" width="30%" :show-close="false" :close-on-click-modal="false">
       <el-form ref="addForm" :rules="rules" :model="addForm" label-width="100px">
         <el-form-item label="返利比例" prop="rebateRate">
-          <el-input v-model.number="addForm.rebateRate" oninput="if(value>100)value=100;if(value<0)value=0"><i class="el-input__icon" slot="suffix">% </i></el-input>
+          <el-input v-model.number="addForm.rebateRate" oninput="if(value>100)value=100;if(value<0)value=0"><i slot="suffix" class="el-input__icon">% </i></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -133,9 +134,9 @@
       <el-form ref="exportForm" :rules="exportRules" :model="exportForm" label-width="120px">
         <el-form-item label="编码范围" prop="">
           <div class="fanwei">
-            <el-input v-model="exportForm.startCustomerId" type="number"></el-input>
+            <el-input v-model="exportForm.startCustomerId" type="number" />
             <span>——</span>
-            <el-input v-model="exportForm.endCustomerId" type="number"></el-input>
+            <el-input v-model="exportForm.endCustomerId" type="number" />
           </div>
         </el-form-item>
       </el-form>
@@ -148,56 +149,53 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
-import {
-  getfinanceInit,
-  getWalletRebateRateUpdate,
-  getCustomerList,
-} from "@/api/finance/wallet";
-import { downloadFiles } from "@/utils/util";
-import { getWalletCustomerList } from "@/api/finance/change_apply";
+import { mapGetters } from 'vuex'
+import { getCustomerList, getWalletRebateRateUpdate } from '@/api/finance/wallet'
+import { downloadFiles } from '@/utils/util'
+import { getWalletCustomerList } from '@/api/finance/change_apply'
+
 export default {
   data() {
     return {
       dialogExportForm: false,
       exportRules: {},
       exportForm: {
-        endCustomerId: "",
-        startCustomerId: "",
+        endCustomerId: '',
+        startCustomerId: ''
       },
-      isShow: JSON.parse(localStorage.getItem("supply_user")).isCustomer,
+      isShow: JSON.parse(localStorage.getItem('supply_user')).isCustomer,
       show: false,
       show2: true,
       searchForm: {
-        customerId: null,
+        customerId: null
       },
       customerList: [],
       listLoading: false, // 列表加载loading
       walletList: [],
       rebateList: [],
       addForm: {
-        rebateRate: null,
+        rebateRate: null
       },
       dialogForm: false,
       rulesSearchForm: {
         customerId: [
           {
             required: true,
-            message: "请选择经销商",
-            trigger: "blur",
-          },
-        ],
+            message: '请选择经销商',
+            trigger: 'blur'
+          }
+        ]
       },
       rules: {
         rebateRate: [
           {
             required: true,
-            message: "请输入返利比例",
-            trigger: "blur",
-          },
-        ],
-      },
-    };
+            message: '请输入返利比例',
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
   },
   beforeRouteEnter(to, from, next) {
     // console.log(11112222);
@@ -205,43 +203,43 @@ export default {
     next((vm) => {
       // 这个时候组件还没有创建，所以要通过vm来访问
       if (
-        from.path == "/finance/details/balance_sum" &&
-        to.path == "/finance/details/wallet" &&
+        from.path == '/finance/details/balance_sum' &&
+        to.path == '/finance/details/wallet' &&
         vm.$route.query.id
       ) {
-        //只有是从A进到B页面才执行
+        // 只有是从A进到B页面才执行
         // 将要执行的逻辑
-        vm.show = true;
-        vm.show2 = false;
+        vm.show = true
+        vm.show2 = false
         vm.getDataWallet({
           customerId: vm.$route.query.id,
-          type: "COMMONLY",
-        });
+          type: 'COMMONLY'
+        })
         vm.getDataRebate({
           customerId: vm.$route.query.id,
-          type: "REBATE",
-        });
+          type: 'REBATE'
+        })
       } else {
         if (vm.isShow) {
-          vm.show2 = false;
+          vm.show2 = false
           vm.getDataWallet({
             customerId: vm.customerId,
-            type: "COMMONLY",
-          });
+            type: 'COMMONLY'
+          })
           vm.getDataRebate({
             customerId: vm.customerId,
-            type: "REBATE",
-          });
+            type: 'REBATE'
+          })
         } else {
-          vm.show = false;
-          vm.show2 = true;
-          vm.walletList = [];
-          vm.rebateList = [];
-          vm.$message("请选择经销商");
-          vm.getCustomerDataList();
+          vm.show = false
+          vm.show2 = true
+          vm.walletList = []
+          vm.rebateList = []
+          vm.$message('请选择经销商')
+          vm.getCustomerDataList()
         }
       }
-    });
+    })
   },
 
   created() {
@@ -272,88 +270,88 @@ export default {
     // }
   },
   computed: {
-    ...mapGetters(["customerId"]),
+    ...mapGetters(['customerId'])
   },
   methods: {
     exportCancelFn() {
       this.exportForm = {
-        endCustomerId: "",
-        startCustomerId: "",
-      };
-      this.dialogExportForm = false;
+        endCustomerId: '',
+        startCustomerId: ''
+      }
+      this.dialogExportForm = false
     },
     exportOKFn() {
-      downloadFiles("/wallet/count/export", { ...this.exportForm });
+      downloadFiles('/wallet/count/export', { ...this.exportForm })
       this.exportForm = {
-        endCustomerId: "",
-        startCustomerId: "",
-      };
-      this.dialogExportForm = false;
+        endCustomerId: '',
+        startCustomerId: ''
+      }
+      this.dialogExportForm = false
     },
-    //导出
+    // 导出
     exportFn() {
-      this.dialogExportForm = true;
+      this.dialogExportForm = true
       // downloadFiles("/wallet/count/export");
     },
-    //清空
+    // 清空
     resetFn() {
-      this.$refs.searchForm.resetFields();
+      this.$refs.searchForm.resetFields()
     },
-    //搜索
+    // 搜索
     async searchFn() {
-      await this.$refs.searchForm.validate();
+      await this.$refs.searchForm.validate()
       this.getDataWallet({
         customerId: this.searchForm.customerId,
-        type: "COMMONLY",
-      });
+        type: 'COMMONLY'
+      })
       this.getDataRebate({
         customerId: this.searchForm.customerId,
-        type: "REBATE",
-      });
+        type: 'REBATE'
+      })
     },
-    //获取经销商列表
+    // 获取经销商列表
     async getCustomerDataList() {
-      let res = await getCustomerList({
+      const res = await getCustomerList({
         pageNum: 1,
-        pageSize: -1,
-      });
-      this.customerList = res.data.records;
+        pageSize: -1
+      })
+      this.customerList = res.data.records
     },
-    //返回
+    // 返回
     goBack() {
-      this.$router.go(-1);
-      this.$store.dispatch("tagsView/delView", this.$route);
+      this.$router.go(-1)
+      this.$store.dispatch('tagsView/delView', this.$route)
     },
-    //取消
+    // 取消
     async cancelFn() {
-      this.dialogForm = false;
-      await this.$refs.addForm.clearValidate();
+      this.dialogForm = false
+      await this.$refs.addForm.clearValidate()
     },
-    //确定
+    // 确定
     async determineFn() {
-      await this.$refs.addForm.validate();
-      const res = this.addForm.rebateRate / 100;
-      this.addForm.rebateRate = res;
-      await getWalletRebateRateUpdate({ ...this.addForm });
+      await this.$refs.addForm.validate()
+      const res = this.addForm.rebateRate / 100
+      this.addForm.rebateRate = res
+      await getWalletRebateRateUpdate({ ...this.addForm })
       if (this.$route.query.id) {
         this.getDataRebate({
           customerId: this.$route.query.id,
-          type: "REBATE",
-        });
+          type: 'REBATE'
+        })
       } else {
         this.getDataRebate({
           customerId: this.searchForm.customerId,
-          type: "REBATE",
-        });
+          type: 'REBATE'
+        })
       }
-      this.$message.success("修改成功");
-      this.dialogForm = false;
+      this.$message.success('修改成功')
+      this.dialogForm = false
     },
-    //修改
+    // 修改
     editFn(v) {
-      this.addForm.customerWalletId = v.customerWalletId;
-      this.addForm.rebateRate = v.rebateRate * 100;
-      this.dialogForm = true;
+      this.addForm.customerWalletId = v.customerWalletId
+      this.addForm.rebateRate = v.rebateRate * 100
+      this.dialogForm = true
     },
     // //一键生成
     // async generateFn() {
@@ -364,23 +362,23 @@ export default {
     // },
     //
     async getDataRebate(data) {
-      let res = await getWalletCustomerList(data);
+      const res = await getWalletCustomerList(data)
       res.data.forEach((item) => {
-        item.sums1 = [];
-        item.sums2 = ["amount"];
-      });
-      this.rebateList = res.data;
+        item.sums1 = []
+        item.sums2 = ['amount']
+      })
+      this.rebateList = res.data
     },
     async getDataWallet(data) {
-      let res = await getWalletCustomerList(data);
+      const res = await getWalletCustomerList(data)
       res.data.forEach((item) => {
-        item.sums1 = [];
-        item.sums2 = ["amount", "freeCreditAmount", "usedCreditAmount"];
-      });
-      this.walletList = res.data;
-    },
-  },
-};
+        item.sums1 = []
+        item.sums2 = ['amount', 'freeCreditAmount', 'usedCreditAmount']
+      })
+      this.walletList = res.data
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/sales_policy/policy_list.vue

@@ -236,7 +236,7 @@
               >提审</el-button>
             </el-popconfirm>
             <el-popconfirm
-              v-if="scope.row.endTime || (scope.row.endTime && scope.row.startTime) && scope.row.examineStatus === 'OK' "
+              v-if=" scope.row.examineStatus === 'OK' && scope.row.status "
               style="margin-left: 10px"
               title="作废？"
               @onConfirm="handleNullify(scope.row)"

src/views/supply/apply/apply_list.vue

@@ -85,7 +85,7 @@
                 <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号"></el-input>
               </el-form-item>
             </el-col>
-            
+
             <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -108,13 +108,13 @@
           </div>
         </div>
         <div class="table">
-          <el-table 
-            v-loading="listLoading" 
-            :data="dataList" 
-            element-loading-text="Loading" 
-            border 
-            fit 
-            highlight-current-row 
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
             stripe
             @selection-change="handleSelectionChange"
             show-summary
@@ -220,53 +220,53 @@
             <el-table-column align="center" label="操作" width="180" fixed="right">
               <template slot-scope="scope">
                 <el-popconfirm
-                  style="margin-right: 10px;" 
-                  title="确定申请吗？" 
-                  @onConfirm="handleSubmit(scope.row.id, 'WAIT')" 
+                  style="margin-right: 10px;"
+                  title="确定申请吗？"
+                  @onConfirm="handleSubmit(scope.row.id, 'WAIT')"
                   v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'" >
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
                 <el-popconfirm
-                  style="margin-right: 10px;" 
-                  title="确定撤回吗？" 
+                  style="margin-right: 10px;"
+                  title="确定撤回吗？"
                   @onConfirm="handleSubmit(scope.row.id, 'SAVE')"
                   v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'" >
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
-                <el-popconfirm 
-                  style="margin-right: 10px;" 
-                  title="确定弃审吗？" 
-                  @onConfirm="handleAbandon(scope.row.id)" 
+                <el-popconfirm
+                  style="margin-right: 10px;"
+                  title="确定弃审吗？"
+                  @onConfirm="handleAbandon(scope.row.id)"
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
-                <el-button 
-                  type="text" 
-                  @click="toForm(scope.row)" 
+                <el-button
+                  type="text"
+                  @click="toForm(scope.row)"
                   v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type === 1">
                   编辑
                 </el-button>
-                <el-button 
-                  type="text" 
-                  @click="toReturnForm(scope.row)" 
+                <el-button
+                  type="text"
+                  @click="toReturnForm(scope.row)"
                   v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type === 2">
                   编辑
                 </el-button>
-                <el-button 
-                  type="text" 
-                  @click="toExamine(scope.row)" 
+                <el-button
+                  type="text"
+                  @click="toExamine(scope.row)"
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">
                   审单
                 </el-button>
-                <el-button 
-                  type="text" 
+                <el-button
+                  type="text"
                   @click="toDetail(scope.row)">
                   详情
                 </el-button>
                 <el-popconfirm
-                  style="margin-left: 10px;" 
-                  title="确定删除吗？" 
-                  @onConfirm="handleDelete(scope.row.id)"  
+                  style="margin-left: 10px;"
+                  title="确定删除吗？"
+                  @onConfirm="handleDelete(scope.row.id)"
                   v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'">
                   <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
                 </el-popconfirm>
@@ -291,7 +291,7 @@
     </div>
 
     <ExamineDialog :isShow.sync="isShowExamineDialog" :examineForm.sync="examineForm" />
-    
+
     <ApplyDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
     <ApplyExamine :listItem="queryItem" v-if="isShowExamine" @backListFormDetail="backList" />
     <ApplyForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />

src/views/supply/apply/components/engin_form.vue

@@ -69,6 +69,11 @@
             <el-input v-model="mainForm.company" placeholder="请输入使用单位" disabled></el-input>
           </el-form-item>
         </el-col>
+           <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="文件编号" prop="fileNo">
+            <el-input v-model="mainForm.fileNo" placeholder="请输入文件编号" disabled></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">
@@ -162,7 +167,7 @@
         </el-table-column>
       </el-table>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <!-- <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button> -->
@@ -275,7 +280,7 @@
           </div>
         </div>
       </div>
-      
+
       <span slot="footer" class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
         <el-button type="primary" @click="submitAddGoods">确 定</el-button>
@@ -329,6 +334,7 @@ export default {
         loginType: '',
         factoryNum: '',
         company: '',
+        fileNo:'',
         contactMan: '',
         tel: '',
         phone: '',
@@ -360,7 +366,7 @@ export default {
       typeList: [],
       stockList: [],
       categoryList: [],
-      
+
       tableGoodsList: [],
       tableSelection: [],
     }
@@ -437,6 +443,7 @@ export default {
         this.mainForm.createDate = data.createTime;
         this.mainForm.remark = data.remark;
         this.mainForm.examineRemark = data.approvalRemark;
+        this.mainForm.fileNo = data.fileNo
         this.screenForm.warehouse = data.correspondId;
         this.fileList = data.fileUrl ? [{
           url: data.fileUrl,
@@ -638,6 +645,7 @@ export default {
         this.mainForm.phone = data.refPhone;
         this.mainForm.address = data.refInstallAddress;
         this.mainForm.remark = data.remark;
+        this.mainForm.fileNo = data.fileNo
       })
     },
 
@@ -681,6 +689,7 @@ export default {
             refPhone: this.mainForm.phone,
             refInstallAddress: this.mainForm.address,
             remark: this.mainForm.remark,
+            fileNo:this.mainForm.fileNo,
             fileUrl: this.fileList && this.fileList.length > 0 ? this.fileList[0].url : '',
             fileName: this.fileList && this.fileList.length > 0 ? this.fileList[0].name : '',
             correspondId: this.screenForm.warehouse,
@@ -728,4 +737,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

src/views/supply/apply/components/engin_return_form.vue

@@ -69,6 +69,11 @@
             <el-input v-model="mainForm.company" placeholder="请输入使用单位" disabled></el-input>
           </el-form-item>
         </el-col>
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="文件编号" prop="fileNo">
+            <el-input v-model="mainForm.fileNo" placeholder="请输入文件编号" disabled></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">
@@ -366,6 +371,7 @@ export default {
         createMan: '',
         createDate: '',
         warehouse: '',
+        fileNo:''
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -490,6 +496,7 @@ export default {
         this.mainForm.createDate = data.createTime;
         this.mainForm.remark = data.remark;
         this.mainForm.warehouse = data.correspondId;
+        this.mainForm.fileNo = data.fileNo
         this.fileList = data.fileUrl ? [{
           url: data.fileUrl,
           name: data.fileName,
@@ -725,6 +732,7 @@ export default {
         this.mainForm.remark = data.remark;
         this.mainForm.jxsNum = data.customerNumber;
         this.mainForm.jxsName = data.customerName;
+        this.mainForm.fileNo = data.fileNo
       })
     },
 
@@ -783,6 +791,7 @@ export default {
             refPhone: this.mainForm.phone,
             refInstallAddress: this.mainForm.address,
             remark: this.mainForm.remark,
+            fileNo:this.mainForm.fileNo,
             fileUrl: this.fileList && this.fileList.length > 0 ? this.fileList[0].url : '',
             fileName: this.fileList && this.fileList.length > 0 ? this.fileList[0].name : '',
             correspondId: this.mainForm.warehouse,

src/views/supply/deliver/commerce_list.vue

@@ -85,7 +85,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            
+
             <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -106,33 +106,47 @@
           </div>
         </div>
         <div class="table">
-          <el-table 
-            v-loading="listLoading" 
-            :data="dataList" 
-            element-loading-text="Loading" 
-            border 
-            fit 
-            highlight-current-row 
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
             stripe
             show-summary
             :summary-method="$getSummaries">
-            <el-table-column align="left" label="发货单号" prop="id" min-width="140" show-overflow-tooltip>
+          <el-table-column align="left" label="订单类型" prop="type" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.type | orderTypeFilter}}
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="发货申请单" prop="id" min-width="130" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
                 <span>{{scope.row.id}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="发货申请日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.type === 3 ? scope.row.stockName : scope.row.correspondName}}
+              </template>
+            </el-table-column>
             <el-table-column align="left" label="订单号" prop="enginOrderNo" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.enginOrderNo" />
                 <span>{{scope.row.enginOrderNo}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="工程登录编号" prop="refEnginRecordNo" min-width="200" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="项目类别" prop="refProjectName" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="工程登录编号" prop="refEnginRecordNo" min-width="200" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.refEnginRecordNo" />
+                <span>{{scope.row.refEnginRecordNo}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="项目类别" prop="refProjectName" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
@@ -145,7 +159,6 @@
                 <span>{{scope.row.customerName}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="存货类别" prop="categoryName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialCode" />
@@ -171,16 +184,41 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.singlePayPrice | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="价税合计" prop="payAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.payAmount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="返利金额" prop="payRebateAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.payRebateAmount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.totalDiscAmount | numToFixed}}
+              </template>
+            </el-table-column>
             <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="未出库数量" prop="notOutNumber" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="审单人" prop="approvalName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="审单日期" prop="approvalTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="审核人" prop="approvalName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="审核日期" prop="approvalTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.examineStatus | statusFilter}}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="操作" width="200" fixed="right">
               <template slot-scope="scope">
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
@@ -209,12 +247,12 @@
     <!-- 密码记录 -->
     <el-dialog title="密码记录" :visible.sync="isShowDialog" :show-close="false" width="50%" :close-on-click-modal="false">
       <div class="table" style="margin: 10px 0 20px;">
-        <el-table 
-          v-loading="dialogTable_listLoading" 
-          :data="dialogTable_dataList" 
-          element-loading-text="Loading" 
-          tooltip-effect="dark" 
-          style="width: 100%" 
+        <el-table
+          v-loading="dialogTable_listLoading"
+          :data="dialogTable_dataList"
+          element-loading-text="Loading"
+          tooltip-effect="dark"
+          style="width: 100%"
           max-height="270">
           <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
           <el-table-column align="center" prop="printPassword" label="密码"></el-table-column>
@@ -238,7 +276,7 @@
         <el-button @click="isShowDialog = false">关 闭</el-button>
       </div>
     </el-dialog>
-    
+
     <CommerceDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
 
   </div>

src/views/supply/engin/components/commerce_examine.vue

@@ -86,13 +86,13 @@
         <el-col :span="24" class="item">
           <div class="label">格力回复</div>
           <div class="value">
-            <el-input v-model="detailData.note1" placeholder="请输入格力回复"></el-input>
+            <el-input v-model="detailData.geLiNote" placeholder="请输入格力回复"></el-input>
           </div>
         </el-col>
         <el-col :span="24" class="item">
           <div class="label">格力内部备注</div>
           <div class="value">
-            <el-input v-model="detailData.note2" placeholder="请输入格力内部备注"></el-input>
+            <el-input v-model="detailData.geLiInerNote" placeholder="请输入格力内部备注"></el-input>
           </div>
         </el-col>
         <el-col :span="24" class="item">

src/views/supply/engin/engin_list.vue

@@ -28,8 +28,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="项目类别" prop="enginName">
-                <el-input v-model="screenForm.enginName" placeholder="请输入项目类别"></el-input>
+              <el-form-item label="项目名称" prop="enginName">
+                <el-input v-model="screenForm.enginName" placeholder="请输入项目名称"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">

src/views/supply/engin/home_list.vue

@@ -28,8 +28,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="项目类别" prop="enginName">
-                <el-input v-model="screenForm.enginName" placeholder="请输入项目类别"></el-input>
+              <el-form-item label="项目名称" prop="enginName">
+                <el-input v-model="screenForm.enginName" placeholder="请输入项目名称"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">