【修改】bug

src/views/basic_data/material/modify_list.vue

@@ -307,11 +307,11 @@
               align="left"
               label="返利类型（钱包）"
               prop="wallets"
-              min-width="200"
+              min-width="250"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <template v-for="(item, index) in scope.row.wallets">
+                <template v-for="(item, index) in comWallets( scope.row.wallets)">
                      <template v-if="item.type === 'REBATE'">
                         <el-tag
                   type="success"
@@ -332,11 +332,11 @@
               align="left"
               label="现金钱包"
               prop="modifyPriceDepartment"
-              min-width="200"
+              min-width="350"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <template  v-for="(item, index) in scope.row.wallets">
+                <template  v-for="(item, index) in comWallets(scope.row.wallets)">
                   <template v-if="item.type === 'COMMONLY'">
 
                    <el-tag
@@ -587,6 +587,16 @@ export default {
         startDate:this.screenForm.startDate
       };
     },
+    comWallets(){
+      return (e)=>{
+          let map = new Map()
+          for (const item of e) {
+            map.set(item.walletId,item)
+          }
+
+          return [...map.values()]
+      }
+    }
   },
   mounted() {
     let params = {

src/views/finance/standbook_list.vue

@@ -98,19 +98,19 @@
       <div class="mymain-container">
         <div class="table">
           <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 label="序号" align="left" width="100" type="index" show-overflow-tooltip></el-table-column>
+            <el-table-column label="序号" align="left" width="50" type="index" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="单据日期" prop="theTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="单据类型" prop="billType" min-width="280" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="单据号" prop="billNo" min-width="220" show-overflow-tooltip>
+            <el-table-column align="left" label="单据类型" prop="billType" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="单据号" prop="billNo" min-width="150" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.billNo" />
                 <span>{{scope.row.billNo}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="钱包" prop="walletName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="钱包" prop="walletName" 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="remark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="预付货款" prop="flag" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="摘要" prop="remark" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="预付货款" prop="flag" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 1
@@ -123,7 +123,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="订单占款" prop="flag" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="订单占款" prop="flag" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 2
@@ -136,7 +136,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="支付货款" prop="flag" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="支付货款" prop="flag" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 3
@@ -149,7 +149,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="押金" prop="flag" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="押金" prop="flag" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 4
@@ -162,7 +162,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="工程保证金" prop="flag" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="工程保证金" prop="flag" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 5
@@ -175,7 +175,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="其他暂扣款" prop="flag" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="其他暂扣款" prop="flag" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 6
@@ -188,7 +188,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="账户余额" prop="balanceAmount" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="账户余额" prop="balanceAmount" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.balanceAmount | numToFixed }}
               </template>
@@ -223,7 +223,7 @@
       <div class="mymain-container">
         <div class="table">
           <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="getSummaries2">
-            <el-table-column label="序号" align="left" width="100" type="index" show-overflow-tooltip></el-table-column>
+            <el-table-column label="序号" align="left" width="50" type="index" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="客户编码" prop="customerCode" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerCode" />
@@ -249,10 +249,10 @@
                 <span>{{scope.row.billNo}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="返利类型" prop="walletName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="返利类型" prop="walletName" 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="remark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="收入" prop="amountType" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="摘要" prop="remark" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="收入" prop="amountType" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.amountType == "IN"
@@ -261,7 +261,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="支出" prop="amountType" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="支出" prop="amountType" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.amountType == "OUT"
@@ -270,17 +270,17 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="折让金额" prop="allowanceAmount" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="折让金额" prop="allowanceAmount" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.allowanceAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="暂扣返利" prop="withholdAmount" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="暂扣返利" prop="withholdAmount" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.withholdAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="结存" prop="balanceAmount" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="结存" prop="balanceAmount" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.balanceAmount | numToFixed }}
               </template>
@@ -479,7 +479,7 @@ export default {
   created() {
 
     // console.log(
-    
+
     //   this.customerId,
     //   this.$store.state.user.customerName,
     //   this.$store.state.user.customerNumber,

src/views/supply/pickup/check.vue

@@ -29,7 +29,14 @@
           <el-row :gutter="20">
             <el-col :xs="24" :sm="11" :lg="9">
               <el-form-item label="提货人姓名" prop="name">
-                <el-input v-model="screenForm.name" placeholder="请通过手机验证获取" readonly></el-input>
+                <!-- <el-input v-model="screenForm.name" placeholder="请通过手机验证获取" ></el-input> -->
+                 <el-select style="width:100%" v-model="screenForm.name"  placeholder="请选提货人姓名" clearable filterable  @change="onChage">
+                  <el-option v-for="item in userList"
+                    :key="item.id"
+                    :label="`${item.takerName} - ${item.customerName}`"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="8" :lg="8">
@@ -38,14 +45,8 @@
               </el-form-item>
             </el-col>
                <el-col :xs="24" :sm="8" :lg="8">
-              <el-form-item label="经销商" prop="customerNumber">
-                <el-select style="width:100%" v-model="screenForm.customerNumber"  placeholder="请选择经销商" clearable filterable >
-                  <el-option v-for="item in dealerList"
-                    :key="item.number"
-                    :label="item.name"
-                    :value="item.number">
-                  </el-option>
-                </el-select>
+              <el-form-item label="经销商" prop="customerName">
+             <el-input v-model="screenForm.customerName" placeholder="经销商" readonly></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="5" :lg="5">
@@ -254,7 +255,7 @@ export default {
         idCard: "",
         manId: "",
         status: 0,
-        customerNumber:''
+        customerName:''
       },
       statusList: [
         { label: "未打单", value: 0 },
@@ -279,6 +280,7 @@ dealerList:[],
       dialogFormRules: {
         password: [{ required: true, message: "请输入密码", trigger: "blur" }],
       },
+      userList:[]
     };
   },
 
@@ -338,12 +340,23 @@ dealerList:[],
         code: this.screenForm.code,
       }).then((res) => {
         this.$successMsg("验证成功");
-        this.screenForm.name = res.data.takerName;
-        this.screenForm.idCard = res.data.identity;
-        this.screenForm.manId = res.data.id;
+        this.screenForm.name = `${res.data[0].takerName} - ${res.data[0].customerName}`;
+        this.screenForm.idCard = res.data[0].identity;
+        this.screenForm.manId = res.data[0].id;
+        this.screenForm.customerName = res.data[0].customerName
+        this.userList = res.data
         this.getListCustomer()
       });
     },
+    onChage(e){
+       const  userInfo =   this.userList.filter(k=>{
+          return e === k.id
+        })
+     this.screenForm.name = `${userInfo[0].takerName} - ${userInfo[0].customerName}`;
+        this.screenForm.idCard = userInfo[0].identity;
+        this.screenForm.manId = userInfo[0].id;
+        this.screenForm.customerName = userInfo[0].customerName
+    },
     getListCustomer(){
     getListCustomer({
           keyword:'',
@@ -352,7 +365,7 @@ dealerList:[],
           pageSize:-1
         }).then(res=>{
           this.dealerList = res.data.records
-          this.screenForm.customerNumber = this.dataList[0].number
+          // this.screenForm.customerNumber = this.dataList[0].number
         })
 
 },
@@ -361,9 +374,7 @@ dealerList:[],
       if (!this.screenForm.manId) {
         return this.$errorMsg("请先查询提货人信息");
       }
-      if (!this.screenForm.customerNumber) {
-          return this.$errorMsg("请选择经销商");
-      }
+
 
       this.listLoading = true;
 
@@ -373,7 +384,7 @@ dealerList:[],
         // takerId: this.screenForm.manId,
         status: this.screenForm.status,
         takerPhone: this.screenForm.phone,
-        customerNumber:this.screenForm.customerNumber
+        // customerName:this.screenForm.customerName
       };
       getPickupList(params).then((res) => {
         this.dataList = res.data.records;

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

@@ -473,7 +473,7 @@ export default {
         this.mainForm.jxsName = data.customerName;
         this.mainForm.fileNum = data.fileNo;
         this.mainForm.remark = data.remark;
-        this.mainForm.fileNum = data.fileNum
+
         data.retailOrderItemList.forEach(item => {
           item.status1 = '';
           item.status2 = '';