Finish Hotfix-zh-151

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

@@ -1382,30 +1382,28 @@ export default {
     // },
     hanleSbumit() {
       this.filterWallets(this.items)
+
       // return
       const params = {
         ...this.base,
         items: this.items,
-
         saleTypeId: this.saleTypeId,
         adminWebsitId: this.adminWebsitId,
         serviceId: this.serviceId,
         adminCompanyName: this.adminCompanyName,
         serviceName: this.nickName
       }
+      //  console.log(this.filterWallets(this.items),params);
       getProductRriceAdd(params).then((res) => {
         console.log(res.code,'klkk');
         this.$successMsg('成功')
         this.$parent.show = 1
         this.$parent.getList()
-
       }).catch((err)=>{
         console.log(err);
        for (let j = 0; j < this.items.length; j++) {
           this.$set(this.items[j],'wallets',[])
         }
-
-
       })
     },
     hanleSave() {
@@ -1621,8 +1619,9 @@ export default {
         }
 
        }
-      }
 
+      }
+      return array
     }
   }
 }

src/views/sales_policy/components/details.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>
@@ -52,7 +52,7 @@
             </el-col>
 
             <el-col :span="24" class="item">
-              <div class="label">备注</div>
+              <div class="label">表头备注</div>
               <div class="value">
                 {{detail.remark}}
               </div>

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

@@ -39,7 +39,11 @@
           </el-col>
           <el-col :span="16" class="item">
             <div class="label">备注</div>
-            <div class="value">{{detailData.remark}}</div>
+            <div class="value">
+              <!-- {{detailData.remark}} -->
+              <el-input v-model="detailData.remark" placeholder="填写备注"  clearable ></el-input>
+
+            </div>
           </el-col>
 
           <el-col :span="24" class="item file">

src/views/supply/implement/nsales_list.vue

@@ -81,8 +81,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="6" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -289,6 +296,7 @@ export default {
         status: '',
         approval:'',
         mainOrderId: '',
+        id:''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -342,6 +350,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
       }
     },
   },
@@ -375,6 +384,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 => {

src/views/supply/retail/retail_list.vue

@@ -199,9 +199,9 @@
                 {{ scope.row.price | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="订单金额" prop="itemTotalAmount" min-width="110" sortable show-overflow-tooltip>
+            <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="110" sortable show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.itemTotalAmount | numToFixed }}
+                {{ scope.row.totalAmount | numToFixed }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="实付金额" prop="payAmount" min-width="110" sortable show-overflow-tooltip>
@@ -457,7 +457,7 @@ export default {
       getList(params).then((res) => {
         res.data.records.forEach(item => {
           item.sums1 = ['qty', 'directTransferQty', 'hasSendQty', 'refundableQty'];
-          item.sums2 = ['price', 'itemTotalAmount', 'payAmount', 'rebateAmount', 'payRebateAmount', 'totalDiscAmount'];
+          item.sums2 = ['price', 'totalAmount', 'payAmount', 'rebateAmount', 'payRebateAmount', 'totalDiscAmount'];
         })
         this.dataList = res.data.records;
         this.listTotal = res.data.total;

src/views/supply/sales/sales_list.vue

@@ -124,7 +124,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="12" class="tr">
+            <el-col :xs="24" :sm="12" :lg="6" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm"