Merge branch 'feature/Feature-copy' into develop

src/components/Common/check-order.vue

@@ -93,7 +93,7 @@ export default {
 
     // 获取详情
     getDetail() {
-      checkOrder({mainOrderId: this.checkOrderId}).then(res => {
+      checkOrder({mainOrderId: this.checkOrderId }).then(res => {
         if(res.data) {
           res.data.forEach(item => {
             item.sums1 = ['refundableQty'];

src/views/sales_policy/components/AddPolicy.vue

@@ -845,7 +845,7 @@ export default {
       this.handletwoList();
     },
     // 获取货品信息
-    handletwoList() {
+   async  handletwoList() {
       // this.searchForm.type
       this.listLoading = true;
 
@@ -855,10 +855,10 @@ export default {
         policyId: this.comCode,
         saleTypeCode: "",
       };
-
-      getMaterialList(paramss)
-        .then((result) => {
-          result.data.records.forEach((k) => {
+      try {
+        const {data}  =  await getMaterialList(paramss)
+      this.dataList = [...this.dataList,...data.records];
+          data.records.forEach((k) => {
             k.walletIds = [];
             k.rebateWalletIds = [];
             if (!k.specification) {
@@ -866,27 +866,24 @@ export default {
               k.specification = k.materialId;
             }
 
-            k.walletRelaList.forEach((l) => {
-              l.id = l.walletId;
-              l.name = l.walletName;
-              if (l.type === "REBATE") {
-                k.rebateWalletIds = [...k.rebateWalletIds, l.walletId];
+            for (let i = 0; i < k.walletRelaList.length; i++) {
+              const d =  k.walletRelaList[i];
+              d.id = d.walletId;
+              d.name = d.walletName;
+              if (d.type === "REBATE") {
+                k.rebateWalletIds = [...k.rebateWalletIds, d.walletId];
               } else {
-                k.walletIds = [...k.walletIds, l.walletId];
+                k.walletIds = [...k.walletIds, d.walletId];
               }
-              // k.walletIds = [...k.walletIds, l.walletId]
-            });
+            }
+
           });
-          // this.dataList=[]
-          console.log();
-          this.dataList = [...this.dataList,...result.data.records];
-          this.listTotal = result.data.total;
+          this.listTotal = data.total;
           this.listLoading = false;
-        })
-        .catch((err) => {
-          console.error(err);
-          // this.listLoading = false
-        });
+      } catch (error) {
+          console.error(error);
+      }
+
     },
     // 提交审核
     handleAddPolicy(policyCustomers,region) {

src/views/sales_policy/components/editPolicy.vue

@@ -890,15 +890,16 @@ export default {
               k.specification = k.materialId
             }
 
-            k.walletRelaList.forEach((l) => {
-              l.id = l.walletId
-              l.name = l.walletName
-              if (l.type === 'REBATE') {
-                k.rebateWalletIds = [...k.rebateWalletIds, l.walletId]
+            for (let i = 0; i < k.walletRelaList.length; i++) {
+              const d =  k.walletRelaList[i];
+              d.id = d.walletId;
+              d.name = d.walletName;
+              if (d.type === "REBATE") {
+                k.rebateWalletIds = [...k.rebateWalletIds, d.walletId];
               } else {
-                k.walletIds = [...k.walletIds, l.walletId]
+                k.walletIds = [...k.walletIds, d.walletId];
               }
-            })
+            }
           })
 
           this.dataList = [...this.dataList,...result.data.records]

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

@@ -158,6 +158,12 @@
 
       <div class="table">
         <el-table :data="tableGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe height="400">
+          <el-table-column align="center" label="新旧单标识" prop="mainOrderId" min-width="140" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.orderBase==1?"新单":"旧单"}}
+            </template>
+          </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="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="存货类别" prop="categoryName" min-width="100" show-overflow-tooltip></el-table-column>
@@ -442,13 +448,26 @@ export default {
     // 确定 添加产品
     submitAddGoods() {
       let tableSelection = [];
+
       this.tableGoodsList.forEach(item => {
+
+
+
         if((item.invoiceNum || item.invoiceNum === 0) && !item.selected) {
           tableSelection.push(item);
         }
       });
 
       for(let i=0; i<tableSelection.length; i++) {
+
+        for (let j = i+1; j < tableSelection.length; j++) {
+
+            if (tableSelection[i].orderBase !== tableSelection[j].orderBase) {
+              return this.$errorMsg('只能选择新单或旧单');
+            }
+        }
+
+
         if(tableSelection[i].invoiceNum < 1) {
           this.$errorMsg('申请数量要大于0');
           return;

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

@@ -260,6 +260,11 @@
       <div class="table">
         <el-table :data="tableGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe height="400" @selection-change="tableSelectionChange">
           <el-table-column align="center" type="selection" width="55" :selectable='checkboxSelect'></el-table-column>
+          <el-table-column align="center" label="新旧单标识" prop="mainOrderId" min-width="140" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.orderBase==1?"新单":"旧单"}}
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="订单类型" prop="orderType" min-width="180" show-overflow-tooltip>
             <template slot-scope="scope">
               {{scope.row.orderType | orderTypeFilter}}
@@ -662,6 +667,13 @@ export default {
       }
 
       for(let i=0; i<this.tableSelection.length; i++) {
+        for (let j = i+1; j < this.tableSelection.length; j++) {
+
+if (this.tableSelection[i].orderBase !== this.tableSelection[j].orderBase) {
+  return this.$errorMsg('只能选择新单或旧单');
+}
+}
+
         if(this.tableSelection[i].invoiceNum === '') {
           this.$errorMsg('请输入申请数量');
           return;

src/views/supply/apply/engin_list.vue

@@ -322,7 +322,7 @@
                   style="margin-left: 10px;"
                   title="确定删除吗？"
                   @onConfirm="handleDelete(scope.row.id)"
-                  v-if="$checkBtnRole('del', $route.meta.roles)">
+                  v-if="scope.row.examineStatus !== 'OK'">
                   <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
                 </el-popconfirm>
               </template>

src/views/supply/deliver/commerce_list.vue

@@ -122,7 +122,7 @@
             :summary-method="$getSummaries">
           <el-table-column align="left" label="订单类型" prop="type" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.type | orderTypeFilter}}
+                {{scope.row.type =="1"?"申请发货单":scope.row.type =="2"?"退货单":"直调发货单" }}
               </template>
             </el-table-column>
             <el-table-column align="left" label="发货申请单" prop="id" min-width="130" show-overflow-tooltip>

src/views/supply/engin/commerce_list.vue

@@ -239,21 +239,21 @@
                 <el-popconfirm
                   style="margin-right: 10px;"
                   title="确定申请吗？"
-                  @onConfirm="handleSubmit(scope.row.parentId)"
+                  @onConfirm="handleSubmit(scope.row.parentId,scope.row)"
                   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="确定撤回吗？"
-                  @onConfirm="handleWithdraw(scope.row.parentId)"
+                  @onConfirm="handleWithdraw(scope.row.parentId,scope.row)"
                   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.parentId)"
+                  @onConfirm="handleAbandon(scope.row.parentId,scope.row)"
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
@@ -283,7 +283,7 @@
                 <el-popconfirm
                   style="margin-left: 10px;"
                   title="确定删除吗？"
-                  @onConfirm="handleDelete(scope.row.parentId)"
+                  @onConfirm="handleDelete(scope.row.parentId,scope.row)"
                   v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'">
                   <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
                 </el-popconfirm>
@@ -552,24 +552,24 @@ export default {
     },
 
     // 申请
-    handleSubmit(id) {
-      applyCom({id}).then(res => {
+    handleSubmit(id,row) {
+      applyCom({id,refEnginRecordNo:row.refEnginRecordNo}).then(res => {
         this.$successMsg();
         this.getList();
       })
     },
 
     // 撤回
-    handleWithdraw(id) {
-      withdrawCom({id}).then(res => {
+    handleWithdraw(id,row) {
+      withdrawCom({id,refEnginRecordNo:row.refEnginRecordNo}).then(res => {
         this.$successMsg();
         this.getList();
       })
     },
 
     // 弃审
-    handleAbandon(id) {
-      abandonCom({id}).then(res => {
+    handleAbandon(id,row) {
+      abandonCom({id,refEnginRecordNo:row.refEnginRecordNo}).then(res => {
         this.$successMsg();
         this.getList();
       })

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

@@ -28,12 +28,16 @@
               <div class="label">经销商编码</div>
               <div class="value">{{detailData.customerNumber}}</div>
             </el-col>
-            <el-col :span="16" class="item">
+            <el-col :span="8" class="item">
               <div class="label">经销商名称</div>
               <div class="value">{{detailData.customerName}}</div>
             </el-col>
             <el-col :span="8" class="item">
-              <div class="label">工程信息单号</div>
+              <div class="label">机型类别</div>
+              <div class="value">{{detailData.refMachineType}}</div>
+            </el-col>
+            <el-col :span="8" class="item">
+              <div class="label">工程订单号</div>
               <div class="value">{{detailData.refEnginRecordNo}}</div>
             </el-col>
             <el-col :span="8" class="item">
@@ -503,7 +507,8 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        closeCom({id: this.listItem.parentId}).then(res => {
+        closeCom({id: this.listItem.parentId, refEnginRecordNo: this.detailData.refEnginRecordNo || '',
+}).then(res => {
           this.$successMsg();
           this.getDetail();
         })
@@ -517,7 +522,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        overOrder({id: this.listItem.parentId}).then(res => {
+        overOrder({id: this.listItem.parentId, refEnginRecordNo: this.detailData.refEnginRecordNo || '',}).then(res => {
           this.$successMsg();
           this.getDetail();
         })
@@ -569,7 +574,8 @@ export default {
             deliverDate: this.deliverForm.date + ' 00:00:00',
             correspondId: this.deliverForm.position,
             remark:this.deliverForm.remark,
-            items: this.deliverGoodsList
+            items: this.deliverGoodsList,
+            refEnginRecordNo: this.detailData.refEnginRecordNo || '',
           }
           deliverOrder(params).then(res => {
             this.$successMsg();
@@ -649,6 +655,8 @@ export default {
             inCorrespondName: warehouseItem2.name,
             inStockId: this.directForm.position2,
             inStockName: positionItem2.name,
+            refEnginRecordNo: this.detailData.refEnginRecordNo || '',
+
           }
           directOrder(params).then(res => {
             this.$successMsg();

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

@@ -24,12 +24,16 @@
           <div class="label">经销商编码</div>
           <div class="value">{{detailData.customerNumber}}</div>
         </el-col>
-        <el-col :span="16" class="item">
+        <el-col :span="8" class="item">
           <div class="label">经销商名称</div>
           <div class="value">{{detailData.customerName}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程信息编号</div>
+              <div class="label">机型类别</div>
+              <div class="value">{{detailData.refMachineType}}</div>
+            </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">工程订单号</div>
           <div class="value">{{detailData.refEnginRecordNo}}</div>
         </el-col>
         <el-col :span="8" class="item">

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

@@ -9,7 +9,7 @@
     <el-form ref="mainForm" :model="mainForm" :rules="mainFormRules" label-width="110px" size="small" label-position="right">
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="工程订单" prop="orderNum">
+          <el-form-item label="工程订单号" prop="orderNum">
             <el-input v-model="mainForm.orderNum" placeholder="系统自动生成" disabled></el-input>
           </el-form-item>
         </el-col>
@@ -179,7 +179,7 @@
     <div class="main-title">
       <div class="title">货品信息</div>
       <div>
-        <el-select v-model="warehouseValue" placeholder="请选择发货仓库" size="small" style="margin-right: 10px">
+        <el-select v-model="warehouseValue" placeholder="请选择发货仓库" size="small" style="margin-right: 10px"  @change="setStock">
           <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
         </el-select>
         <el-button type="primary" size="small" icon="el-icon-search" @click="checkStock">检查库存</el-button>
@@ -273,11 +273,9 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
-        <!-- <el-table-column align="center" label="总仓库" prop="status1" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <div>{{ scope.row.status1 | status1Filter }}</div>
-          </template>
-        </el-table-column> -->
+        <el-table-column align="center" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip>
+
+        </el-table-column>
         <el-table-column align="center" label="仓库状态" prop="status2" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <div>{{ status2Filter(scope.row) }}</div>
@@ -557,7 +555,19 @@ export default {
     goBack() {
       this.$emit('backListFormDetail');
     },
+    setStock(id){
+      if (this.goodsList.length) {
+        const item = this.warehouseList.find(e=>e.id === id)
+        console.log(item);
+          this.goodsList.forEach(k=>{
+            k.correspondName = item.name
+            this.$set(k,'correspondName',item.name)
+            this.$set(k,'correspondId',item.id)
+
+          })
+      }
 
+    },
     getDate() {
       var date = new Date();
       var seperator1 = "-";
@@ -901,6 +911,10 @@ export default {
               this.$errorMsg('数量不能大于工程信息数量');
               return;
             }
+            if(!this.multipleSelection[i].correspondId){
+              this.$errorMsg('请选择仓库');
+              return;
+            }
           }
 
           let goodsList = JSON.parse(JSON.stringify(this.multipleSelection));
@@ -935,6 +949,8 @@ export default {
             remark: this.mainForm.remark || '',
             fileNo: this.mainForm.fileNo || '',
             serviceId: this.mainForm.salesMan,
+            correspondId:goodsList[0].correspondId,
+            correspondName:goodsList[0].correspondName,
             serviceName: saleManItem ? saleManItem.nickName : goodsList[0].serviceName,
             items: goodsList,
           }

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

@@ -24,12 +24,16 @@
           <div class="label">经销商编码</div>
           <div class="value">{{detailData.customerNumber}}</div>
         </el-col>
-        <el-col :span="16" class="item">
+        <el-col :span="8" class="item">
           <div class="label">经销商名称</div>
           <div class="value">{{detailData.customerName}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程信息编号</div>
+              <div class="label">机型类别</div>
+              <div class="value">{{detailData.refMachineType}}</div>
+            </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">工程订单号</div>
           <div class="value">{{detailData.refEnginRecordNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
@@ -176,7 +180,7 @@
         <el-table-column align="right" label="可退数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="退订数量" prop="tdQty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.tdQty" size="mini"></el-input>
+            <el-input v-model="scope.row.tdQty" size="mini" @blur="hasTdQty" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
@@ -273,7 +277,13 @@ export default {
     goBack() {
       this.$emit('backListFormDetail');
     },
+    hasTdQty(row){
+      if (row.tdQty<0) {
+          row.tdQty = 0
+          this.$errorMsg('不能填负数')
+        }
 
+    },
     // 获取详情
     getDetail() {
       getOrderDetail({id: this.listItem.parentId}).then(res => {
@@ -298,7 +308,8 @@ export default {
         let params = {
           enginOrderId: this.detailData.enginOrderId,
           items: this.detailData.items,
-          refundNote: this.returnForm.remark
+          refundNote: this.returnForm.remark,
+          refEnginRecordNo:this.detailData.refEnginRecordNo,
         };
         returnCom(params).then(res => {
           this.$successMsg();

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

@@ -16,6 +16,7 @@
               <div class="label">工程订单号</div>
               <div class="value">{{detailData.enginOrderNo}}</div>
             </el-col>
+
             <el-col :span="8" class="item">
               <div class="label">订单日期</div>
               <div class="value">{{detailData.orderDate}}</div>
@@ -530,7 +531,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        closeHome({id: this.listItem.parentId}).then(res => {
+        closeHome({id: this.listItem.parentId, refEnginRecordNo:this.detailData.refEnginRecordNo,}).then(res => {
           this.$successMsg();
           this.getDetail();
         })
@@ -544,7 +545,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        overOrder({id: this.listItem.parentId}).then(res => {
+        overOrder({id: this.listItem.parentId, refEnginRecordNo:this.detailData.refEnginRecordNo,}).then(res => {
           this.$successMsg();
           this.getDetail();
         })
@@ -596,7 +597,7 @@ export default {
             deliverDate: this.deliverForm.date + ' 00:00:00',
             correspondId: this.deliverForm.position,
             remark:this.deliverForm.remark,
-
+            refEnginRecordNo:this.detailData.refEnginRecordNo,
             items: this.deliverGoodsList
           }
           this.formLoading = true;
@@ -680,6 +681,8 @@ export default {
             inCorrespondName: warehouseItem2.name,
             inStockId: this.directForm.position2,
             inStockName: positionItem2.name,
+            refEnginRecordNo: this.detailData.refEnginRecordNo || '',
+
           }
           this.formLoading = true;
           directOrder(params).then(res => {
@@ -704,6 +707,7 @@ export default {
       editRemarkHome({
         enginOrderId: this.detailData.enginOrderId,
         geLiInerNote: this.detailData.geLiInerNote,
+        refEnginRecordNo:this.detailData.refEnginRecordNo,
       }).then(res => {
         this.$successMsg('编辑成功');
         this.getDetail();

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

@@ -518,6 +518,7 @@ export default {
         let params = JSON.parse(JSON.stringify(this.detailData));
         params.examineNote = this.examineForm.remark;
         params.examineResult = val;
+        params.refEnginRecordNo=this.detailData.refEnginRecordNo,
         params.saleTypeId = this.detailData.saleTypeId;
         params.saleTypeCode = saleTypeItem.saleCode;
         params.saleTypeName = saleTypeItem.saleName;

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

@@ -843,6 +843,7 @@ export default {
         recordNo: this.screenForm.loginNum,
         projectName: this.screenForm.enginName,
         useUnit: this.screenForm.company,
+        refEnginRecordNo:this.mainForm.loginNum,
         examineStatus: 'OK'
       }).then(res => {
         this.dialogTable_dataList = res.data.records;
@@ -893,7 +894,9 @@ export default {
         saleTypeId: this.mainForm.saleType,
         userId: uid,
         enginOrderId: this.mainForm.orderNum,
-        customerId: customerId
+        customerId: customerId,
+        refEnginRecordNo:this.mainForm.loginNum,
+
       }).then(async res => {
         // 复制当前明细数据
         let copyGoodsList = JSON.parse(JSON.stringify(this.goodsList));
@@ -1050,6 +1053,7 @@ export default {
         specification: this.goodsScreenForm.proModel,
         price1: this.goodsScreenForm.price1,
         price2: this.goodsScreenForm.price2,
+        refEnginRecordNo:this.mainForm.loginNum,
         customerId:this.listItem ?this.listItem.customerId :'' ,
       }).then(res => {
         let oldGoodsList = this.goodsList;

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

@@ -208,7 +208,7 @@
         <el-table-column align="right" label="可退数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="退订数量" prop="tdQty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.tdQty" size="mini" type="number" @mousewheel.native.prevent></el-input>
+            <el-input v-model="scope.row.tdQty" size="mini" @blur="hasTdQty(scope.row)" type="number" @mousewheel.native.prevent></el-input>
           </template>
         </el-table-column>
         <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
@@ -304,7 +304,13 @@ export default {
       var currentdate = year + seperator1 + month + seperator1 + strDate;
       return currentdate;
     },
+    hasTdQty(row){
+      if (row.tdQty<0) {
+          row.tdQty = 0
+          this.$errorMsg('不能填负数')
+        }
 
+    },
     // 返回列表
     goBack() {
       this.$emit('backListFormDetail');
@@ -333,7 +339,8 @@ export default {
         let params = {
           enginOrderId: this.detailData.enginOrderId,
           items: this.detailData.items,
-          refundNote: this.returnForm.remark
+          refundNote: this.returnForm.remark,
+          refEnginRecordNo:this.detailData.refEnginRecordNo,
         };
         returnHome(params).then(res => {
           this.$successMsg();

src/views/supply/engin/engin_list.vue

@@ -130,7 +130,7 @@
                 {{scope.row.examineStatus | statusFilter}}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="工程登录编号" sortable prop="enginInfoNo" min-width="150" show-overflow-tooltip>
+            <el-table-column align="left" label="工程信息单号" sortable prop="enginInfoNo" min-width="150" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.enginInfoNo" />
                 <span>{{scope.row.enginInfoNo}}</span>

src/views/supply/engin/home_list.vue

@@ -310,21 +310,21 @@
                 <el-popconfirm
                   style="margin-right: 10px;"
                   title="确定申请吗？"
-                  @onConfirm="handleSubmit(scope.row.parentId)"
+                  @onConfirm="handleSubmit(scope.row.parentId,scope.row)"
                   v-if="scope.row.examineStatus === 'SAVE'" >
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
                 <el-popconfirm
                   style="margin-right: 10px;"
                   title="确定撤回吗？"
-                  @onConfirm="handleWithdraw(scope.row.parentId)"
+                  @onConfirm="handleWithdraw(scope.row.parentId,scope.row)"
                   v-if="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.parentId)"
+                  @onConfirm="handleAbandon(scope.row.parentId,scope.row)"
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
@@ -354,7 +354,7 @@
                 <el-popconfirm
                   style="margin-left: 10px;"
                   title="确定删除吗？"
-                  @onConfirm="handleDelete(scope.row.parentId)"
+                  @onConfirm="handleDelete(scope.row.parentId,scope.row)"
                   v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'">
                   <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
                 </el-popconfirm>
@@ -653,31 +653,31 @@ export default {
     },
 
     // 申请
-    handleSubmit(id) {
-      applyHome({id}).then(res => {
+    handleSubmit(id,row) {
+      applyHome({id,refEnginRecordNo:row.refEnginRecordNo}).then(res => {
         this.$successMsg();
         this.getList();
       })
     },
 
     // 撤回
-    handleWithdraw(id) {
-      withdrawHome({id}).then(res => {
+    handleWithdraw(id,row) {
+      withdrawHome({id,refEnginRecordNo:row.refEnginRecordNo}).then(res => {
         this.$successMsg();
         this.getList();
       })
     },
 
     // 弃审
-    handleAbandon(id) {
-      abandonHome({id}).then(res => {
+    handleAbandon(id,row) {
+      abandonHome({id,refEnginRecordNo:row.refEnginRecordNo}).then(res => {
         this.$successMsg();
         this.getList();
       })
     },
 
     // 删除
-    handleDelete(id) {
+    handleDelete(id,row) {
       deleteHome({ids: id}).then(res => {
         this.$successMsg();
         this.getList();

src/views/supply/implement/nsales_list.vue

@@ -146,7 +146,17 @@
                 ></el-input>
               </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="syncStatus">
+                <el-select v-model="screenForm.syncStatus" clearable filterable>
+                  <el-option label="未推送" :value="0"> </el-option>
+                  <el-option label="推送成功" :value="1"> </el-option>
+                  <el-option label="失败推送" :value="-1"> </el-option>
+
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm"
@@ -184,6 +194,18 @@
             <!-- <el-table-column align="center" type="selection" width="55"></el-table-column>-->
             <el-table-column
               align="left"
+              label="推送状态"
+              prop="syncStatus"
+              min-width="100"
+              show-overflow-tooltip
+              sortable
+            >
+              <template slot-scope="scope">
+                {{ scope.row.syncStatus ==0 ?"未推送": scope.row.syncStatus ==1 ?"推送成功": "失败推送" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="left"
               label="状态"
               prop="examineStatus"
               min-width="100"
@@ -551,6 +573,7 @@ export default {
         printTime: "",
         mainOrderId: "",
         printDesc: null,
+        syncStatus:'',
         id: "",
       },
       statusList: [
@@ -616,6 +639,7 @@ export default {
         correspondName: this.screenForm.warehouse,
         startTime: this.screenForm.date ? this.screenForm.date[0] : "",
         endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        syncStatus:this.screenForm.syncStatus,
         approvalStartTime: this.screenForm.approval
           ? this.screenForm.approval[0]
           : "",
@@ -659,6 +683,8 @@ export default {
         materialNumber: this.screenForm.chNum,
         specification: this.screenForm.model,
         correspondName: this.screenForm.warehouse,
+        syncStatus:this.screenForm.syncStatus,
+
         startTime: this.screenForm.date ? this.screenForm.date[0] : "",
         endTime: this.screenForm.date ? this.screenForm.date[1] : "",
         approvalStartTime: this.screenForm.approval

src/views/supply/sales/sales_list.vue

@@ -158,6 +158,16 @@
                 ></el-input>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="推送状态" prop="syncStatus">
+                <el-select v-model="screenForm.syncStatus" clearable filterable>
+                  <el-option label="未推送" :value="0"> </el-option>
+                  <el-option label="推送成功" :value="1"> </el-option>
+                  <el-option label="失败推送" :value="-1"> </el-option>
+
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="12" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -218,6 +228,18 @@
             ></el-table-column>
             <el-table-column
               align="left"
+              label="推送状态"
+              prop="syncStatus"
+              min-width="100"
+              show-overflow-tooltip
+              sortable
+            >
+              <template slot-scope="scope">
+                {{ scope.row.syncStatus ==0 ?"未推送": scope.row.syncStatus ==1 ?"推送成功": "失败推送" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="left"
               label="状态"
               prop="examineStatus"
               min-width="100"
@@ -594,6 +616,7 @@ export default {
         approval: "",
         printTime: "",
         printDesc: null,
+        syncStatus:'',
         id: "",
       },
       statusList: [
@@ -664,6 +687,8 @@ export default {
         correspondId: this.screenForm.warehouse.join(","),
         startTime: this.screenForm.date ? this.screenForm.date[0] : "",
         endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        syncStatus:this.screenForm.syncStatus,
+
         approvalStartTime: this.screenForm.approval
           ? this.screenForm.approval[0]
           : "",
@@ -719,6 +744,8 @@ export default {
         materialNumber: this.screenForm.chNum,
         specification: this.screenForm.model,
         correspondId: this.screenForm.warehouse.join(","),
+        syncStatus:this.screenForm.syncStatus,
+
         startTime: this.screenForm.date ? this.screenForm.date[0] : "",
         endTime: this.screenForm.date ? this.screenForm.date[1] : "",
         approvalStartTime: this.screenForm.approval