Finish Hotfix-mo-46

src/views/supply/reserve/reserve_list.vue

@@ -5,6 +5,14 @@
       <div class="screen-container">
         <el-form ref="screenForm" :model="screenForm" label-width="90px" size="small" label-position="left">
           <el-row :gutter="20">
+            <el-col :xs="24" :sm="24" :lg="24">
+              <el-form-item prop="status" label-width="0">
+                <el-radio-group v-model="screenForm.status" size="medium" @change="getList()">
+                  <el-radio-button label="">全部</el-radio-button>
+                  <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="产品名称" prop="goodsName">
                 <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
@@ -16,6 +24,16 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="规格型号" prop="model">
+                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="销售订单号" prop="saleNum">
+                <el-input v-model="screenForm.saleNum" placeholder="请输入销售订单号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商名称" prop="jxsName">
                 <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
               </el-form-item>
@@ -53,13 +71,8 @@
                 <el-input v-model="screenForm.orderNum" placeholder="请输入预留单号"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="销售订单号" prop="saleNum">
-                <el-input v-model="screenForm.saleNum" placeholder="请输入销售订单号"></el-input>
-              </el-form-item>
-            </el-col>
             
-            <el-col :xs="24" :sm="12" :lg="18" class="tr">
+            <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="resetScreenForm">清空</el-button>
                 <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
@@ -96,7 +109,7 @@
             </el-table-column>
             <el-table-column align="center" label="预留单号" prop="id" min-width="180" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="预留日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="140" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="订单日期" prop="orderTime" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.orderTime | dateToDayFilter}}
@@ -112,7 +125,7 @@
             <el-table-column align="right" label="预留数量" prop="reservedNum" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="开单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="经销商编码" prop="customerNumber" min-width="140" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="制表人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
@@ -162,6 +175,7 @@ import { getList, closeData } from "@/api/supply/reserve";
 import ReserveDetail from "@/views/supply/reserve/components/reserve_detail";
 import ReserveForm from "@/views/supply/reserve/components/reserve_form";
 
+let that
 export default {
   components: {
     ReserveDetail,
@@ -169,11 +183,8 @@ export default {
   },
   filters: {
     statusFilter(val) {
-      const MAP = {
-        0: '已关闭',
-        1: '执行中',
-      }
-      return MAP[val];
+      let obj = that.statusList.find(o => o.value == val);
+      return obj ? obj.label : ''
     }
   },
   data() {
@@ -194,7 +205,13 @@ export default {
         updateMan: '',
         orderNum: '',
         saleNum: '',
+        model: '',
+        status: '',
       },
+      statusList: [
+        { label: '执行中', value: 1 },
+        { label: '已关闭', value: 0 },
+      ],
 
       queryItem: {},
       isShowDetail: false,
@@ -205,18 +222,26 @@ export default {
   computed: {
     exParams() {
       return {
-        retreatOrderNo: this.screenForm.orderNum,
+        materialName: this.screenForm.goodsName,
+        materialCode: this.screenForm.goodsNum,
         customerNumber: this.screenForm.jxsNum,
         customerName: this.screenForm.jxsName,
-        productName: this.screenForm.chName,
-        specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
-        status: 2, // 1:发货单，2:工程发货单
+        createBy: this.screenForm.createMan,
+        updateBy: this.screenForm.updateMan,
+        id: this.screenForm.orderNum,
+        orderId: this.screenForm.saleNum,
+        specification: this.screenForm.model,
+        status: this.screenForm.status,
       }
     },
   },
 
+  beforeCreate() {
+    that = this;
+  },
+
   created() {
     this.getList();
   },
@@ -239,6 +264,8 @@ export default {
         updateBy: this.screenForm.updateMan,
         id: this.screenForm.orderNum,
         orderId: this.screenForm.saleNum,
+        specification: this.screenForm.model,
+        status: this.screenForm.status,
       };
       getList(params).then((res) => {
         res.data.records.forEach(item => {