Merge branch 'feature/Feature-return' into develop

src/views/supply/apply/apply_list.vue

@@ -119,7 +119,11 @@
             </el-table-column>
             <el-table-column align="center" label="发货申请单" prop="id" min-width="140" 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="correspondName" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="仓库" prop="correspondName" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.type === 3 ? scope.row.stockName : scope.row.correspondName}}
+              </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="customerNumber" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>

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

@@ -151,9 +151,9 @@
 
       <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></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="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>
+          <!-- <el-table-column align="center" label="存货类别" prop="categoryName" min-width="100" show-overflow-tooltip></el-table-column> -->
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="单位" prop="unit" min-width="80" show-overflow-tooltip></el-table-column>
@@ -340,6 +340,9 @@ export default {
         specification: this.screenForm.model,
         saleType: 1, // 1零售，2工程
       }).then(res => {
+        res.data.records.forEach(item => {
+          item.invoiceNum = '-' + item.invoiceNum;
+        })
         let oldGoodsList = this.goodsList;
         let newGoodsList = res.data.records;
         for(let i = 0; i < oldGoodsList.length; i++) {
@@ -384,9 +387,9 @@ export default {
       // if(!this.screenForm.warehouse) {
       //   return this.$errorMsg('请选择仓库');
       // }
-      if(!this.screenForm.type) {
-        return this.$errorMsg('请选择存货类别');
-      }
+      // if(!this.screenForm.type) {
+      //   return this.$errorMsg('请选择存货类别');
+      // }
       this.currentPage = 1;
       this.getSalesGoodsList();
     },

src/views/supply/apply/engin_list.vue

@@ -119,7 +119,11 @@
             </el-table-column>
             <el-table-column align="center" label="发货申请单" prop="id" min-width="140" 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="correspondName" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="仓库" prop="correspondName" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.type === 3 ? scope.row.stockName : scope.row.correspondName}}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="订单号" prop="enginOrderNo" min-width="140" show-overflow-tooltip></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="refProjectName" min-width="120" show-overflow-tooltip></el-table-column>

src/views/supply/sales/components/sales_return_form.vue

@@ -330,6 +330,9 @@ export default {
         materialName: this.screenForm.goodsName,
         specification: this.screenForm.model,
       }).then(res => {
+        res.data.records.forEach(item => {
+          item.invoiceNum = '-' + item.invoiceNum;
+        })
         let oldGoodsList = this.goodsList;
         let newGoodsList = res.data.records;
         for(let i = 0; i < oldGoodsList.length; i++) {