【修改】bug

src/views/issue/index.vue

@@ -39,6 +39,7 @@
             type="primary"
             icon="el-icon-plus"
             @click="clickImport()"
+            v-if="$checkBtnRole('add', $route.meta.roles)"
             >新增</el-button
           >
           <div class="tips fl">
@@ -79,6 +80,7 @@
                 style="margin-left: 10px"
                 title="确定删除吗？"
                 @onConfirm="deleteData(scope.row.id)"
+                v-if="$checkBtnRole('del', $route.meta.roles)"
               >
                 <el-button slot="reference" type="text">删除</el-button>
               </el-popconfirm>

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

@@ -344,7 +344,7 @@ export default {
           let oldItem = oldGoodsList[i]
           for(let j = 0; j < newGoodsList.length; j++) {
             let newItem = newGoodsList[j]
-            if(newItem.materialId === oldItem.materialId){
+            if(newItem.orderId === oldItem.orderId){
               newGoodsList[j].selected = true;
               break;
             }
@@ -443,22 +443,24 @@ export default {
         }
       }
 
-      let allList = this.tableGoodsList;
-      let selectList = this.tableSelection;
-      let submitList = [];
-
-      for(let i = 0; i < allList.length; i++) {
-        for(let j = 0; j < selectList.length; j++) {
-          if(selectList[j].orderId == allList[i].orderId){
-            submitList.push(allList[i]);
-          }
-        }
-      }
+      // let allList = this.tableGoodsList;
+      // let selectList = this.tableSelection;
+      // let submitList = [];
+
+      // for(let i = 0; i < allList.length; i++) {
+      //   for(let j = 0; j < selectList.length; j++) {
+      //     if(selectList[j].orderId == allList[i].orderId){
+      //       submitList.push(allList[i]);
+      //     }
+      //   }
+      // }
       // this.goodsList = this.goodsList.concat(submitList);
 
-      this.goodsList = this.delRepeat(submitList, this.goodsList);
+      // this.goodsList = this.delRepeat(submitList, this.goodsList);
       this.isShowDialog = false;
       this.tableGoodsList = [];
+
+      this.goodsList = this.goodsList.concat(this.tableSelection);
     },
 
     // 删除产品

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

@@ -489,7 +489,7 @@ export default {
           let oldItem = oldGoodsList[i]
           for(let j = 0; j < newGoodsList.length; j++) {
             let newItem = newGoodsList[j]
-            if(newItem.materialId === oldItem.materialId){
+            if(newItem.orderId === oldItem.orderId){
               newGoodsList[j].selected = true;
               break;
             }
@@ -602,24 +602,27 @@ export default {
         }
       }
 
-      let allList = this.tableGoodsList;
-      let selectList = this.tableSelection;
-      let submitList = [];
+      // let allList = this.tableGoodsList;
+      // let selectList = this.tableSelection;
+      // let submitList = [];
 
-      for(let i = 0; i < allList.length; i++) {
-        for(let j = 0; j < selectList.length; j++) {
-          if(selectList[j].enginOrderNo == allList[i].enginOrderNo){
-            submitList.push(allList[i]);
-          }
-        }
-      }
-      // this.goodsList = this.goodsList.concat(submitList);
+      // for(let i = 0; i < allList.length; i++) {
+      //   for(let j = 0; j < selectList.length; j++) {
+      //     if(selectList[j].enginOrderNo == allList[i].enginOrderNo){
+      //       submitList.push(allList[i]);
+      //     }
+      //   }
+      // }
 
-      this.goodsList = this.delRepeat(submitList, this.goodsList);
+      // this.goodsList = this.delRepeat(submitList, this.goodsList);
       this.isShowDialog = false;
       this.tableGoodsList = [];
 
-      this.getEnginGoodsDetail(submitList[0].enginOrderNo);
+
+      this.goodsList = this.goodsList.concat(this.tableSelection);
+
+      this.getEnginGoodsDetail(this.tableSelection[0].enginOrderNo);
+      // this.getEnginGoodsDetail(submitList[0].enginOrderNo);
     },
 
     getEnginGoodsDetail(enginOrderNo) {

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

@@ -11,7 +11,7 @@
         <el-row>
           <el-col :span="8" class="item">
             <div class="label">工程订单号</div>
-            <div class="value">{{detailData.enginOrderId}}</div>
+            <div class="value">{{detailData.enginOrderNo}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">订单日期</div>
@@ -156,8 +156,8 @@
             </template>
           </el-table-column>
           <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="已发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="已退数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="原订单数量" prop="enginNum" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="已退数量" prop="retiredQty" 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="tax" min-width="100" show-overflow-tooltip></el-table-column>
         </el-table>

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

@@ -10,7 +10,7 @@
       <el-row>
         <el-col :span="8" class="item">
           <div class="label">工程订单号</div>
-          <div class="value">{{detailData.enginOrderId}}</div>
+          <div class="value">{{detailData.enginOrderNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">订单日期</div>
@@ -143,7 +143,7 @@
         </el-table-column>
         <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="已发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="已退数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="已退数量" prop="retiredQty" 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="tax" min-width="100" show-overflow-tooltip></el-table-column>
       </el-table>

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

@@ -209,7 +209,7 @@
         </el-table-column>
         <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100"></el-table-column>
         <el-table-column align="center" label="已发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="已退数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="已退数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.remark" size="small"></el-input>
@@ -472,6 +472,9 @@ export default {
       getDictList({sysDictEnum: 'PRODUCT_TYPE'}).then(res => {
         this.typeList = res.data;
       })
+      getDictList({sysDictEnum: 'STOCK_ORDER'}).then(res => {
+        this.stockList = res.data;
+      })
     },
 
     // 获取仓库列表

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

@@ -10,7 +10,7 @@
       <el-row>
         <el-col :span="8" class="item">
           <div class="label">工程订单号</div>
-          <div class="value">{{detailData.enginOrderId}}</div>
+          <div class="value">{{detailData.enginOrderNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">订单日期</div>

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

@@ -11,7 +11,7 @@
         <el-row>
           <el-col :span="8" class="item">
             <div class="label">工程订单号</div>
-            <div class="value">{{detailData.enginOrderId}}</div>
+            <div class="value">{{detailData.enginOrderNo}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">订单日期</div>
@@ -156,8 +156,8 @@
             </template>
           </el-table-column>
           <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="已发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="已退数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="原订单数量" prop="enginNum" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="已退数量" prop="retiredQty" 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="tax" min-width="100" show-overflow-tooltip></el-table-column>
         </el-table>

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

@@ -10,7 +10,7 @@
       <el-row>
         <el-col :span="8" class="item">
           <div class="label">工程订单号</div>
-          <div class="value">{{detailData.enginOrderId}}</div>
+          <div class="value">{{detailData.enginOrderNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">订单日期</div>
@@ -143,7 +143,7 @@
         </el-table-column>
         <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="已发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="已退数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="已退数量" prop="retiredQty" 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="tax" min-width="100" show-overflow-tooltip></el-table-column>
       </el-table>

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

@@ -215,7 +215,7 @@
         </el-table-column>
         <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100"></el-table-column>
         <el-table-column align="center" label="已发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="已退数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="已退数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.remark" size="small"></el-input>
@@ -482,6 +482,9 @@ export default {
       getDictList({sysDictEnum: 'PRODUCT_TYPE'}).then(res => {
         this.typeList = res.data;
       })
+      getDictList({sysDictEnum: 'STOCK_ORDER'}).then(res => {
+        this.stockList = res.data;
+      })
     },
 
     // 获取销售类型列表

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

@@ -10,7 +10,7 @@
       <el-row>
         <el-col :span="8" class="item">
           <div class="label">工程订单号</div>
-          <div class="value">{{detailData.enginOrderId}}</div>
+          <div class="value">{{detailData.enginOrderNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">订单日期</div>

src/views/supply/engin/home_list.vue

@@ -130,7 +130,7 @@
                 </el-popconfirm>
                 <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && scope.row.examineStatus === 'SAVE'">编辑</el-button>
                 <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审批</el-button>
-                <el-button type="text" @click="toReturn(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles)">退订</el-button>
+                <el-button type="text" @click="toReturn(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus !== 'FAIL'">退订</el-button>
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
                 <el-popconfirm style="margin-left: 10px;" title="确定删除吗？" @onConfirm="handleDelete(scope.row.parentId)" v-if="$checkBtnRole('del', $route.meta.roles)">
                   <el-button slot="reference" type="text">删除</el-button>

src/views/supply/pickup/sum_list.vue

@@ -75,17 +75,17 @@
               {{ scope.row.pickType == '1' ? '自提':'物流快递' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="单据日期" prop="orderTime" min-width="120" show-overflow-tooltip>
+          <el-table-column align="center" label="单据日期" prop="theTime" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{ scope.row.orderTime | dateToDayFilter }}
+              {{ scope.row.theTime | dateToDayFilter }}
             </template>
           </el-table-column>
           <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="180" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="工程编号" prop="enginOrderNo" min-width="180" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品编号" prop="productNumber" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品名称" prop="productName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="产品编号" prop="materialCode" min-width="160" 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="number" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="提货总数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="备注" prop="remark" min-width="100" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>