【修改】bug

src/views/basic_data/material/components/modify_list-apply.vue

@@ -1584,8 +1584,9 @@ export default {
       downloadFiles('/product-upd-price/download')
     },
     filterWallets(array){
-      const wallets = []
+
       for (let i = 0; i < array.length; i++) {
+         const wallets = []
         if (array[i].walletsId.length){
         for (let j = 0; j < array[i].walleList.length; j++) {
           for (let k = 0; k < array[i].walletsId.length; k++) {
@@ -1601,7 +1602,7 @@ export default {
           }
         }
         array[i].wallets = wallets
-      }
+       }
        if(array[i].walletRebateId.length){
           for (let k = 0; k < array[i].rebateList.length; k++) {
           if (!array[i].walletRebateId.length) return
@@ -1621,6 +1622,7 @@ export default {
 
        }
       }
+
     }
   }
 }

src/views/sales_policy/components/AddPolicy.vue

@@ -90,7 +90,7 @@
                   /> </el-form-item
               ></el-col>
               <el-col :xs="24" :ms="24" :lg="24">
-                <el-form-item label="销售政策说明" prop="remark">
+                <el-form-item label="表头备注" prop="remark">
                   <el-input
                     v-model="searchForm.remark"
                     placeholder="新风机变频挂机。按提货数量1:3开单"

src/views/sales_policy/components/Examine.vue

@@ -15,11 +15,11 @@
               <div class="value">{{ detail.code }}</div>
             </el-col>
             <el-col :span="8" class="item">
-              <div class="label">销售政策说明</div>
+              <div class="label">销售政策名称</div>
               <div class="value">
                 <el-input
                   v-model="detail.title"
-                  placeholder="请输入政策说明"
+                  placeholder="请输入政策名称"
                 />
               </div>
             </el-col>
@@ -50,11 +50,11 @@
             </el-col>
 
             <el-col :span="24" class="item">
-              <div class="label">备注</div>
+              <div class="label">表头备注</div>
               <div class="value">
                 <el-input
                   v-model="detail.remark"
-                  placeholder="请输入备注"
+                  placeholder="请输入表头备注"
                 />
               </div>
             </el-col>
@@ -84,7 +84,7 @@
                   placeholder="生效日期"
                   default-time="00:00:00"
                   value-format="yyyy-MM-dd HH:mm:ss"
-                /> </el-form-item>
+                />
               </div>
             </el-col>
             <el-col :span="24" class="item">
@@ -96,7 +96,7 @@
                   placeholder="生效日期"
                   default-time="00:00:00"
                   value-format="yyyy-MM-dd HH:mm:ss"
-                /> </el-form-item>
+                />
               </div>
             </el-col>
           </el-row>

src/views/sales_policy/components/editPolicy.vue

@@ -88,7 +88,7 @@
                     value-format="yyyy-MM-dd HH:mm:ss"
                   /> </el-form-item></el-col>
               <el-col :xs="24" :ms="24" :lg="24">
-                <el-form-item label="销售政策说明" prop="remark">
+                <el-form-item label="表头备注" prop="remark">
                   <el-input
                     v-model="searchForm.remark"
                     placeholder="新风机变频挂机。按提货数量1:3开单"

src/views/sales_policy/policy_list.vue

@@ -308,7 +308,7 @@
         <el-table-column
           show-overflow-tooltip
           prop="title"
-          label="销售政策说明"
+          label="销售政策名称"
          min-width="150"
           align="left"
         />

src/views/supply/apply/apply_list.vue

@@ -191,7 +191,7 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="政策说明" prop="policyTitle" min-width="350" show-overflow-tooltip>
+            <el-table-column align="left" label="销售政策名称" prop="policyTitle" min-width="350" show-overflow-tooltip>
 
             </el-table-column>
                <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="350" show-overflow-tooltip>

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

@@ -33,7 +33,7 @@
           <div class="label">备注</div>
           <div class="value">
             <template v-if="userName">
-              <el-input v-model="detailData.remark" clearable></el-input>
+              <el-input v-model="detailData.remark"      placeholder="填写备注" clearable></el-input>
             </template>
             <template v-else>
               {{ detailData.remark }}

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

@@ -447,7 +447,7 @@
           size="small"
         >
           <el-row v-if="factor.length && !dataList.length" style="margin: 0 0 20px 0;font-size: 20px;">
-            引用销售政策说明：{{ !remark ? factor[0].name : remark }} 配提比例：{{ pop }}
+            引用销售政策表头备注：{{ !remark ? factor[0].name : remark }} 配提比例：{{ pop }}
           </el-row>
           <el-row v-if="factor.length && !dataList.length && factor[0].remark" style="margin: 0 0 20px 0;font-size: 20px;">
             备注：{{  factor[0].remark}}

src/views/supply/policy/policy_list.vue

@@ -753,6 +753,7 @@ export default {
     handleDelete(id) {
       deleteList({ id }).then(res => {
         this.$successMsg('删除成功')
+        this.getList()
       })
     },
     // 查询列表

src/views/supply/price/components/modify_list-apply.vue

@@ -1585,8 +1585,9 @@ export default {
       downloadFiles('/product-upd-price/download')
     },
     filterWallets(array){
-      const wallets = []
+
       for (let i = 0; i < array.length; i++) {
+            const wallets = []
         if (array[i].walletsId.length){
         for (let j = 0; j < array[i].walleList.length; j++) {
           for (let k = 0; k < array[i].walletsId.length; k++) {

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

@@ -32,7 +32,7 @@
           <div class="label">备注</div>
           <div class="value">
             <template v-if="userName">
-              <el-input v-model="detailData.remark" clearable></el-input>
+              <el-input v-model="detailData.remark" placeholder="填写备注" clearable></el-input>
             </template>
             <template v-else>
               {{ detailData.remark }}

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

@@ -96,7 +96,10 @@
         </el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="文件编号" prop="fileNo" min-width="200" show-overflow-tooltip>
-            </el-table-column>
+          <template slot-scope="scope">
+               <el-input v-model="scope.row.fileNo" size="small" ></el-input>
+          </template>
+           </el-table-column>
       <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.price" size="small" type="number" v-if="listItem && !isDealer"></el-input>

src/views/supply/sales/sales_list.vue

@@ -116,8 +116,15 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-
-            <el-col :xs="24" :sm="12" :lg="18" class="tr">
+ <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="出库单号" prop="id">
+                <el-input
+                  v-model="screenForm.id"
+                  placeholder="请输入出库单号"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="12" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm"
@@ -476,6 +483,7 @@ export default {
         status: "",
         mainOrderId: "",
         approval:'',
+        id:''
 
       },
       statusList: [
@@ -530,6 +538,8 @@ export default {
         approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : "",
         approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : "",
         mainOrderId: this.screenForm.mainOrderId,
+
+        id: this.screenForm.id
       };
     },
   },
@@ -563,6 +573,7 @@ export default {
          approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : "",
         approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : "",
         mainOrderId: this.screenForm.mainOrderId,
+        id: this.screenForm.id
       };
       getList(params).then((res) => {
         res.data.records.forEach((item) => {