Finish Hotfix-zh-125

src/api/supply/pickup.js

@@ -111,7 +111,7 @@ export function getPickupManInfo(params) {
 // 增加打印次数
 export function addPrint(params) {
   return request({
-    url: '/pick/printAdd',
+    url: '/invoice/printInvoice',
     method: 'post',
     params
   })
@@ -142,4 +142,4 @@ export function cancelData(params) {
     method: 'post',
     params
   })
-}
+}

src/views/deposit_commerce/deposit_list.vue

@@ -5,7 +5,7 @@
         <el-radio-button label="全部" />
         <el-radio-button label="已退押" />
       </el-radio-group>
-      <br /><br />
+      <br><br>
       <!-- 筛选条件 -->
       <div>
         <el-form
@@ -41,10 +41,15 @@
               </el-form-item>
             </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="行业类别" prop="refTradeCategory">
+                <el-input v-model="screenForm.refTradeCategory" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="使用单位" prop="refUseUnit">
                 <el-input
                   v-model="screenForm.refUseUnit"
-                  placeholder="请输入"
+                  placeholder="请输入使用单位"
                 />
               </el-form-item>
             </el-col>
@@ -58,7 +63,7 @@
                 />
               </el-form-item>
             </el-col>
-             <el-col :xs="24" :sm="12" :lg="6">
+         <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结束申请日期" prop="endSubmitTime">
                 <el-date-picker
                   v-model="screenForm.endSubmitTime"
@@ -68,57 +73,7 @@
                 />
               </el-form-item>
             </el-col>
-
-
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="是否退押 " prop="isRefundDeposit">
-                <el-select
-                  style="width: 100%"
-                  v-model="screenForm.isRefundDeposit"
-                  placeholder="请选择是否退押 "
-                >
-                  <el-option label="默认" :value="null"></el-option>
-
-                  <el-option
-                    v-for="item in refundDepositArr"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="状态 " prop="examineStatus">
-                <el-select
-                  style="width: 100%"
-                  v-model="screenForm.examineStatus"
-                  placeholder="请选择状态 "
-                >
-                  <el-option label="默认" :value="null"></el-option>
-
-                  <el-option
-                    v-for="item in examineStatusArr"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品名称" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col> -->
-             <el-col :xs="24" :sm="12" :lg="6">
+              <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="开始受理日期" prop="startConfirmTime">
                 <el-date-picker
                   v-model="screenForm.startConfirmTime"
@@ -128,7 +83,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
+             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结束受理日期" prop="endConfirmTime">
                 <el-date-picker
                   v-model="screenForm.endConfirmTime"
@@ -138,8 +93,44 @@
                 />
               </el-form-item>
             </el-col>
-            <template v-if="!isCustomer">
-              <el-col :xs="24" :sm="12" :lg="6">
+             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="是否退押 " prop="isRefundDeposit">
+              <el-select style="width:100%" v-model="screenForm.isRefundDeposit"  placeholder="请选择是否退押 " >
+              <el-option  label="默认" :value="null"></el-option>
+
+                <el-option v-for="item in refundDepositArr"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+              </el-form-item>
+            </el-col>
+   <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="状态 " prop="examineStatus">
+              <el-select style="width:100%" v-model="screenForm.examineStatus"  placeholder="请选择状态 " >
+              <el-option  label="默认" :value="null"></el-option>
+
+                <el-option v-for="item in examineStatusArr"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="产品名称" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="规格型号" prop="">
+                <el-input placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col> -->
+              <template v-if="!isCustomer">
+                <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="审核人" prop="confirmName">
                   <el-input
                     v-model="screenForm.confirmName"
@@ -155,16 +146,17 @@
                   />
                 </el-form-item>
               </el-col>
-                 <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="安装日期"   style="margin-bottom:0">
+
+                   <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="安装日期" style="margin-bottom:0">
                   <div class="fanwei">
                      <el-form-item prop="startInstallTime">
                           <el-date-picker
-                        v-model="screenForm.startInstallTime"
-                        class="dateStyle"
-                        type="datetime"
-                        placeholder="选择日期"
-                      />
+                  v-model="screenForm.startInstallTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
 
                      </el-form-item>
                       <span>-</span>
@@ -180,58 +172,47 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
+               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="规格型号" prop="specification">
-                        <el-input  v-model="screenForm.specification" ></el-input>
+                        <el-input  v-model="screenForm.specification" placeholder="请输入规格型号" ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="特价编号" prop="specialNo">
 
-                        <el-input  v-model="screenForm.specialNo" ></el-input>
+                        <el-input  v-model="screenForm.specialNo" placeholder="请输入特价编号" ></el-input>
 
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-               <el-form-item label="跨区厂编号" prop="refFactoryNo">
+               <el-form-item label="厂编号" prop="refFactoryNo">
 
-                        <el-input  v-model="screenForm.refFactoryNo" ></el-input>
+                        <el-input  v-model="screenForm.refFactoryNo" placeholder="请输入厂编号" ></el-input>
 
                 </el-form-item>
 
               </el-col>
-              <!-- <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="产品编码" >
-                  <div class="fanwei">
-                     <el-form-item prop="startMaterialOldNumber">
-                        <el-input type="startMaterialOldNumber" ></el-input>
-                     </el-form-item>
 
-                  <span>-</span>
-                    <el-form-item prop="endMaterialOldNumber">
-                    <el-input type="endMaterialOldNumber" ></el-input>
-                     </el-form-item>
-                  </div>
 
-                </el-form-item>
-
-
-              </el-col> -->
-
-            </template>
+              </template>
             <el-col :xs="24" :sm="24" :lg="24">
-             <div class="fl">
+    <div class="fl">
           <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
-            <el-radio-button label="HOME">家用工程</el-radio-button>
+            <el-radio-button label="TRADE">家用工程</el-radio-button>
             <el-radio-button label="TRADE">商用工程</el-radio-button>
           </el-radio-group> -->
           <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button>
         </div>
               <el-form-item label="" class="fr">
-                <el-button size="mini" @click="resetScreenForm">清空</el-button>
-                <el-button size="mini" type="primary" @click="submitScreenForm"
-                  >搜索</el-button
-                >
+                <el-button
+                  size="mini"
+                  @click="resetScreenForm"
+                >清空</el-button>
+                <el-button
+                  size="mini"
+                  type="primary"
+                  @click="submitScreenForm"
+                >搜索</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -239,9 +220,11 @@
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix" style="display: flex">
-        <el-button type="primary" size="mini" @click="hanleDownloadFiles"
-          >导出</el-button
-        >
+        <el-button
+          type="primary"
+          size="mini"
+          @click="hanleDownloadFiles"
+        >导出</el-button>
         <el-upload
           v-if="$checkBtnRole('import', $route.meta.roles)"
           class="import-btn"
@@ -284,14 +267,14 @@
               min-width="160"
               show-overflow-tooltip
             />
-            <el-table-column
+             <el-table-column
               align="left"
               label="申请日期"
               prop="submitTime"
               min-width="160"
               show-overflow-tooltip
             />
-            <el-table-column
+             <el-table-column
               align="left"
               label="受理日期"
               prop="checkDate"
@@ -322,7 +305,7 @@
                 <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-             <el-table-column
+              <el-table-column
               align="left"
               label="规格型号"
               prop="specification"
@@ -346,8 +329,7 @@
                   v-if="scope.row.isRefundDeposit"
                   type="success"
                   size="small"
-                  >是</el-tag
-                >
+                >是</el-tag>
                 <el-tag v-else type="warning" size="small">否</el-tag>
               </template>
             </el-table-column>
@@ -382,32 +364,29 @@
                   v-if="scope.row.examineStatus == 'SAVE'"
                   type="success"
                   size="small"
-                  >保存
+                >保存
                 </el-tag>
                 <el-tag
                   v-if="scope.row.examineStatus == 'WAIT'"
                   type="warning"
                   size="small"
-                  >待审核
+                >待审核
                 </el-tag>
                 <el-tag
                   v-if="scope.row.examineStatus == 'OK'"
                   type="warning"
                   size="mini"
-                  >通过</el-tag
-                >
+                >通过</el-tag>
                 <el-tag
                   v-if="scope.row.examineStatus == 'FAIL'"
                   type="warning"
                   size="small"
-                  >不通过</el-tag
-                >
+                >不通过</el-tag>
                 <el-tag
                   v-if="scope.row.examineStatus == 'CLOSE'"
                   type="warning"
                   size="small"
-                  >关闭</el-tag
-                >
+                >关闭</el-tag>
               </template>
             </el-table-column>
             <el-table-column
@@ -417,7 +396,7 @@
               min-width="160"
               show-overflow-tooltip
             />
-            <el-table-column
+              <el-table-column
               align="left"
               label="资料审核日期"
               prop="refDatumAcceptDate"
@@ -437,18 +416,16 @@
                   class="textColor"
                   size="mini"
                   @click="detailFn(scope.row)"
-                  >详情</el-button
-                >
+                >详情</el-button>
                 <el-button
                   v-if="
                     scope.row.examineStatus == 'SAVE' &&
-                    $checkBtnRole('apply', $route.meta.roles)
+                      $checkBtnRole('apply', $route.meta.roles)
                   "
                   type="text"
                   class="textColor"
                   @click="surrenderFn(scope.row)"
-                  >申请退押</el-button
-                >
+                >申请退押</el-button>
                 <!-- <el-button type="text" class="textColor" slot="reference"
                   >免扣退押</el-button
                 > -->
@@ -477,21 +454,21 @@
 </template>
 
 <script>
-import DepositListDetail from "./components/deposit_list-detail";
-import DepositApplyDeduction from "./components/deposit-apply-deduction.vue";
+import DepositListDetail from './components/deposit_list-detail'
 import {
   getDepositManageDate,
 } from "@/api/engin_deposit/refund_list";
-import DepositApplySurrender from "./components/deposit-apply-surrender.vue";
-import { downloadFiles, handleImport } from "@/utils/util";
-import { getList } from "@/api/engin_deposit.js";
-import Mixin from "@/mixin";
+import DepositApplyDeduction from './components/deposit-apply-deduction.vue'
+import DepositApplySurrender from './components/deposit-apply-surrender.vue'
+import { downloadFiles, handleImport } from '@/utils/util'
+import { getList } from '@/api/engin_deposit.js'
+import Mixin from '@/mixin'
 
 export default {
   components: {
     DepositListDetail,
     DepositApplyDeduction,
-    DepositApplySurrender,
+    DepositApplySurrender
   },
   mixins: [Mixin],
   data() {
@@ -501,73 +478,72 @@ export default {
       listTotal: 0, // 列表总数
       dataList: [], // 列表数据
       screenForm: {
-        confirmName: "", // 审核人
-        createName: "", // 创建人
-        customerKeyword: "", // 客户编码/客户名称
-        endDeliverTime: "", // 发货申请日期-结束
-        enginOrderNo: "", // 工程订单编号
-        enginOrderType: "TRADE", // 工程订单类型
-        examineStatus: "", // 状态
-        refEnginRecordNo: "", // 登录单号
-        refProjectName: "", // 项目名称
-        refUseUnit: "", // 使用单位
-        startDeliverTime: "", // 发货申请日期-开始
-        startSubmitTime: "",
-        startConfirmTime: "",
-        isRefundDeposit: null,
-        startInstallTime: "",
-        endConfirmTime: "",
-        endInstallTime: "",
+        confirmName: '', // 审核人
+        createName: '', // 创建人
+        customerKeyword: '', // 客户编码/客户名称
+        endDeliverTime: '', // 发货申请日期-结束
+        enginOrderNo: '', // 工程订单编号
+        enginOrderType: 'TRADE', // 工程订单类型
+        examineStatus: '', // 状态
+        refEnginRecordNo: '', // 登录单号
+        refProjectName: '', // 项目名称
+        refTradeCategory: '',
+        refUseUnit: '', // 使用单位
+        startDeliverTime: '', // 发货申请日期-开始
+        startSubmitTime:'',
+        startConfirmTime:'',
+        isRefundDeposit:null,
+        endConfirmTime:'',
+        startInstallTime:'',
+        endInstallTime:'',
         specification:'',
         refFactoryNo:'',
-        factoryNo: "",
-        specialNo: "",
-        refRegionWork: "",
-        endSubmitTime:'',
+        factoryNo:'',
+        specialNo:'',
+        refRegionWork:'',
+        endSubmitTime:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
-      deduction: "全部",
+      deduction: '全部',
       showPage: 1,
       importFileList: [],
       selectData: [],
-      baseURL: "",
-      refundDepositArr: [
+      baseURL: '',
+      refundDepositArr:[
         {
-          label: "是",
-          value: true,
+          label:'是',
+          value:true
         },
         {
-          label: "否",
-          value: false,
-        },
+          label:'否',
+          value:false
+        }
       ],
 
-      examineStatusArr: [
-        {
-          label: "保存",
-          value: "SAVE",
+      examineStatusArr:[
+         {
+          label:'保存',
+          value:'SAVE'
         },
         {
-          label: "待审核",
-          value: "WAIT",
+          label:'待审核',
+          value:'WAIT'
         },
         {
-          label: "通过",
-          value: "OK",
+          label:'通过',
+          value:'OK'
         },
         {
-          label: "关闭",
-          value: "CLOSE",
+          label:'关闭',
+          value:'CLOSE'
         },
-      ],
-    };
+      ]
+    }
   },
-  computed: {
-    isCustomer() {
-      return (
-        this.$store.getters.customerId && this.$store.getters.customerNumber
-      );
-    },
+  computed:{
+    isCustomer(){
+      return this.$store.getters.customerId && this.$store.getters.customerNumber
+    }
   },
   methods: {
       //同步资料日期
@@ -577,84 +553,82 @@ export default {
     },
     // 免扣申请
     deductionFn() {
-      this.showPage = 3;
+      this.showPage = 3
     },
     // 申请退押
     surrenderFn(row) {
-      this.depositManageId = row.depositManageId;
-      this.showPage = 4;
+      this.depositManageId = row.depositManageId
+      this.showPage = 4
     },
     detailFn(row) {
-      this.depositManageId = row.depositManageId;
-      this.refEnginRecordNo = row.refEnginRecordNo;
-      this.showPage = 2;
+      this.depositManageId = row.depositManageId
+      this.refEnginRecordNo = row.refEnginRecordNo
+      this.showPage = 2
     },
     getList() {
-      this.listLoading = true;
+      this.listLoading = true
+
       const params = {
         pageSize: this.pageSize,
         pageNum: this.currentPage,
-        isRefundDeposit: this.deduction === "已退押" ? true : null,
-        ...this.screenForm,
-      };
+        isRefundDeposit: '',
+        ...this.screenForm
+      }
+      params.isRefundDeposit = this.deduction === '已退押' ? true : ''
 
       getList(params).then((res) => {
-        this.dataList = res.data.records;
+        this.dataList = res.data.records
         res.data.records.forEach((item) => {
           // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-          item.sums1 = ["qty"];
-          item.sums2 = ["depositAmount", "diffAmount", "price"];
-        });
-        this.listLoading = false;
-        this.listTotal = res.data.total;
-      });
+          item.sums1 = ['qty']
+          item.sums2 = ['depositAmount', 'diffAmount', 'price']
+        })
+        this.listLoading = false
+        this.listTotal = res.data.total
+      })
     },
     handleRadio() {
-      this.currentPage = 1;
-      this.getList();
+      this.getList()
     },
     hanleDownloadFiles() {
       if (this.selectData.length) {
-        const arr = [];
+        const arr = []
         for (let i = 0; i < this.selectData.length; i++) {
-          arr.push(this.selectData[i].depositManageId);
+          arr.push(this.selectData[i].depositManageId)
         }
-        downloadFiles("/deposit-manage/export", {
-          id: arr,
-          orderType: "TRADE",
-        });
+        downloadFiles('/deposit-manage/export', { id: arr, orderType:'TRADE' })
       } else {
-        this.$errorMsg("请选择押金项");
+        this.$errorMsg('请选择押金项')
       }
     },
     // 导入
     async handleImport(param) {
-      this.importLoading = true;
-      const file = param.file;
-      console.log(file, 123);
-      const formData = new FormData();
-      formData.append("file", file);
+      this.importLoading = true
+      const file = param.file
+      console.log(file, 123)
+      const formData = new FormData()
+      formData.append('file', file)
       // formData.append("policyId", this.screenForm.code);
-      const result = await handleImport("deposit-manage/import", formData);
-      this.importLoading = false;
-      this.importFileList = [];
+      const result = await handleImport('deposit-manage/import', formData)
+      this.importLoading = false
+      this.importFileList = []
       if (result.code == 200) {
-        this.$alert(result.message, "导入成功", {
-          confirmButtonText: "确定",
-        });
+        this.$alert(result.message, '导入成功', {
+          confirmButtonText: '确定'
+        })
 
-        this.handletwoList();
+        this.handletwoList()
       } else {
-        this.$alert(result.message, "导入失败", {
-          confirmButtonText: "确定",
-        });
+        this.$alert(result.message, '导入失败', {
+          confirmButtonText: '确定'
+        })
       }
     },
     handleSelectionAllChange(e) {
-      this.selectData = e;
-    },
-  },
-};
+      this.selectData = e
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/deposit_commerce/refund_list.vue

@@ -43,6 +43,11 @@
                 ></el-input>
               </el-form-item>
             </el-col> -->
+               <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="行业类别" prop="refTradeCategory">
+                <el-input v-model="screenForm.refTradeCategory" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="使用单位" prop="refUseUnit">
                 <el-input
@@ -433,6 +438,7 @@ export default {
         specialNo: "",
         refRegionWork: "",
         endSubmitTime:'',
+        refTradeCategory:''
       }, // 搜索表单
        refundDepositArr: [
         {
@@ -633,7 +639,7 @@ export default {
         }
         downloadFiles("/deposit-manage/export", {
           id: arr,
-          orderType: "HOME",
+          orderType: "TRADE",
         });
       } else {
         this.$errorMsg("请选择押金项");

src/views/deposit_home/refund_list.vue

@@ -43,6 +43,11 @@
                 ></el-input>
               </el-form-item>
             </el-col> -->
+              <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="行业类别" prop="refTradeCategory">
+                <el-input v-model="screenForm.refTradeCategory" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="使用单位" prop="refUseUnit">
                 <el-input
@@ -433,6 +438,7 @@ export default {
         specialNo: "",
         refRegionWork: "",
         endSubmitTime:'',
+        refTradeCategory:''
       }, // 搜索表单
        refundDepositArr: [
         {

src/views/supply/apply/apply_list.vue

@@ -295,7 +295,7 @@
     <ApplyDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
     <ApplyExamine :listItem="queryItem" v-if="isShowExamine" @backListFormDetail="backList" />
     <ApplyForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
-    <ApplyReturnForm :listItem="queryItem" v-if="isShowReturnForm" @backListFormDetail="backList" />
+    <ApplyReturnForm :listItem="queryItem" v-if="isShowReturnForm" @backListFormDetail="backList" :isShow="isShow"/>
 
   </div>
 </template>
@@ -404,7 +404,15 @@ export default {
     this.getSalesmanList();
     this.getList();
   },
+  activated() {
+      this.isShow = false
+  if (this.$route.query && this.$route.query.isShow) {
+    this.isShow = this.$route.query.isShow
 
+      this.toReturnForm()
+  }
+
+},
   methods: {
     // 获取业务员列表
     getSalesmanList() {

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

@@ -112,7 +112,7 @@
         </el-table-column>
       </el-table>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer">
         <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button>
@@ -209,7 +209,7 @@
           </div>
         </div>
       </div>
-      
+
       <span slot="footer" class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
         <el-button type="primary" @click="submitAddGoods">确 定</el-button>
@@ -266,7 +266,7 @@ export default {
       // typeList: [],
       stockList: [],
       categoryList: [],
-      
+
       tableGoodsList: [],
       isFirst: false,
     }
@@ -308,7 +308,13 @@ export default {
   methods: {
     // 返回列表
     goBack() {
-      this.$emit('backListFormDetail');
+       console.log(45454);
+      if (this.$parent.isShow=='true') {
+        this.$router.replace('/supply/implement/sum_list')
+      }else{
+         this.$emit('backListFormDetail');
+      }
+
     },
 
     // 获取详情
@@ -373,7 +379,7 @@ export default {
         this.categoryList = res.data.records;
       })
     },
-    
+
     // 库存字段
     stockFilter(item, type) {
       let STOCK_ORDER_INVOICE = this.stockList.find(o => o.dictCode == 'STOCK_ORDER_INVOICE').dictValue;
@@ -583,4 +589,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

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

@@ -37,6 +37,8 @@
             <div class="label">项目类别</div>
             <div class="value">{{detailData.refProjectName}}</div>
           </el-col>
+
+
           <el-col :span="8" class="item">
             <div class="label">工程登录类型</div>
             <div class="value">{{detailData.enginOrderType | enginTypeFilter}}</div>
@@ -49,9 +51,9 @@
             <div class="label">使用单位</div>
             <div class="value">{{detailData.refUseUnit}}</div>
           </el-col>
-          <el-col :span="8" class="item">
-            <div class="label"></div>
-            <div class="value"></div>
+           <el-col :span="8" class="item">
+            <div class="label">行业类别</div>
+            <div class="value">{{detailData.refTradeCategory}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">联系人</div>

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

@@ -36,6 +36,7 @@
           <div class="label">项目类别</div>
           <div class="value">{{detailData.refProjectName}}</div>
         </el-col>
+
         <el-col :span="8" class="item">
           <div class="label">工程登录类型</div>
           <div class="value">{{detailData.enginOrderType | enginTypeFilter}}</div>
@@ -48,10 +49,10 @@
           <div class="label">使用单位</div>
           <div class="value">{{detailData.refUseUnit}}</div>
         </el-col>
-        <el-col :span="8" class="item">
-          <div class="label"></div>
-          <div class="value"></div>
-        </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">行业类别</div>
+            <div class="value">{{detailData.refTradeCategory}}</div>
+          </el-col>
         <el-col :span="8" class="item">
           <div class="label">联系人</div>
           <div class="value">{{detailData.refLinkman}}</div>
@@ -64,6 +65,7 @@
           <div class="label">移动电话</div>
           <div class="value">{{detailData.refPhone}}</div>
         </el-col>
+
         <el-col :span="24" class="item">
           <div class="label">安装地址</div>
           <div class="value">{{detailData.refInstallAddress}}</div>

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

@@ -79,11 +79,11 @@
             <el-input v-model="mainForm.fileNo" placeholder="请输入文件编号" disabled></el-input>
           </el-form-item>
         </el-col>
-         <!-- <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="行业类别" prop="fileNo">
-            <el-input v-model="mainForm.fileNo" placeholder="请输入文件编号" disabled></el-input>
+         <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="行业类别" prop="refTradeCategory">
+            <el-input v-model="mainForm.refTradeCategory" placeholder="请输入文件编号" disabled></el-input>
           </el-form-item>
-        </el-col> -->
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">
@@ -256,9 +256,9 @@
             </template>
           </el-table-column>
           <el-table-column align="center" label="工程登录编号" prop="refEnginRecordNo" min-width="200" show-overflow-tooltip></el-table-column>
-                  <el-table-column align="center" label="表头登录类型" prop="refPromiseStatus" min-width="200" show-overflow-tooltip></el-table-column>
+                  <!-- <el-table-column align="center" label="表头登录类型" prop="refPromiseStatus" min-width="200" show-overflow-tooltip></el-table-column>
                   <el-table-column align="center" label="项目类别" prop="refProjectCategory" min-width="200" show-overflow-tooltip></el-table-column>
-                  <el-table-column align="center" label="行业类别" prop="refTradeCategory" min-width="200" show-overflow-tooltip></el-table-column>
+                  <el-table-column align="center" label="行业类别" prop="refTradeCategory" min-width="200" 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="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
@@ -362,7 +362,8 @@ export default {
         createMan: '',
         createDate: '',
         examineRemark: '',
-        refProjectName:""
+        refProjectName:"",
+        refTradeCategory:''
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -470,6 +471,7 @@ export default {
         this.mainForm.fileNo = data.fileNo
         this.mainForm.refProjectName = data.refProjectName
          this.mainForm.enginName = data.refProjectCategory;
+         this.mainForm.refTradeCategory = data.refTradeCategory
         this.screenForm.warehouse = data.correspondId;
         // this.screenForm.refProjectName = data.refProjectName
         this.fileList = data.fileUrl ? [{
@@ -684,6 +686,9 @@ export default {
         this.mainForm.address = data.refInstallAddress;
         this.mainForm.remark = data.remark;
         this.mainForm.fileNo = data.fileNo
+        this.mainForm.refTradeCategory = data.refTradeCategory
+
+
       })
     },
 
@@ -719,6 +724,7 @@ export default {
             remark: this.mainForm.remark,
             enginOrderNo: this.mainForm.loginNum,
             refProjectName: this.mainForm.refProjectName,
+            refTradeCategory:this.mainForm.refTradeCategory,
             refProjectCategory:this.mainForm.enginName,
             enginOrderType: this.mainForm.loginType,
             refFactoryNo: this.mainForm.factoryNum,

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

@@ -331,7 +331,7 @@ export default {
   },
   name: 'EnginForm',
   componentName: 'EnginForm',
-  props: ['listItem'],
+  props: ['listItem','isShow'],
   filters: {
     orderTypeFilter(val) {
       const MAP = {
@@ -455,7 +455,10 @@ export default {
   methods: {
     // 返回列表
     goBack() {
-      this.$emit('backListFormDetail');
+
+         this.$emit('backListFormDetail');
+
+
     },
 
     getDate() {

src/views/supply/deliver/components/sum_print.vue

@@ -103,14 +103,22 @@ export default {
 
     // 添加次数
     addPrint() {
-      const ids = this.listItem.map(item => {
-        return item.invoiceOrderId
-      })
-        this.$parent.getList()
-      // addPrint({ ids: ids.join(',') }).then(res => {
-      //   // this.$successMsg('提交成功');
+      const ids = this.detailArr.map(item => {
+            if (item.invoicePickBeans && item.invoicePickBeans.length) {
+              for (let index = 0; index < item.invoicePickBeans.length; index++) {
+                  const element = item.invoicePickBeans[index];
+                return  item.invoiceOrderId || element.invoiceOrderId || element.id
+              }
+            }else{
+                return item.invoiceOrderId || item.id
+            }
 
-      // })
+      })
+        console.log(ids,'kkk');
+      addPrint({ ids: ids.join(',') }).then(res => {
+        // this.$successMsg('提交成功');
+         this.$parent.getList()
+      })
     }
   }
 }

src/views/supply/deliver/sum_list.vue

@@ -107,7 +107,9 @@
           <div class="fl">
             <el-button type="primary" size="mini" @click="toPrint" :disabled="tableSelection.length < 1">打印发货单</el-button>
           </div>
-          <div class="fr">
+          <!--  -->
+          <div class="fr" style="display: flex;">
+            <el-button size="mini" type="primary" v-if="$checkBtnRole('refund', $route.meta.roles)"  style="margin-right: 10px;" icon="el-icon-plus" @click="$router.push('/supply/deliver/apply_list?isShow=true')">退货申请</el-button>
             <ExportButton :exUrl="'invoice/exportInvoice'" :exParams="exParams" />
           </div>
         </div>
@@ -210,7 +212,11 @@
                 {{scope.row.payAmount | numToFixed}}
               </template>
             </el-table-column>
-
+             <el-table-column align="right" label="未出库数量" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{comRefundableQty(scope.row.type ,scope.row.salesExamineStatus , scope.row)}}
+              </template>
+            </el-table-column>
             <el-table-column align="right" label="发货数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="政策单号" prop="policyCode" min-width="100" show-overflow-tooltip></el-table-column>
@@ -222,7 +228,10 @@
             <el-table-column align="left" label="项目名称" prop="refProjectName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="表头备注" prop="remark" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="备注" prop="invoiceRemark" min-width="200" show-overflow-tooltip></el-table-column>
-          </el-table>
+                   <el-table-column align="left" label="打印次数" prop="printNum" min-width="200" show-overflow-tooltip></el-table-column>
+
+
+        </el-table>
         </div>
       </div>
       <div class="pagination clearfix">
@@ -302,6 +311,21 @@ export default {
         serviceId: this.screenForm.salesMan,
       }
     },
+    comRefundableQty(){
+      return (type,status,row)=>{
+        if (type == 2) {
+            return ''
+        }else{
+            if (status == 'OK') {
+                return 0
+            }else{
+              return row.refundableQty
+            }
+
+        }
+
+      }
+    }
   },
 
   created() {