Merge remote-tracking branch 'origin/master'

zkqy-ui/src/views/orderMange/purchase/listInfoTwo.vue

@@ -861,7 +861,7 @@ export default {
         this.materiels = res.data;
         this.materiels.forEach((item) => {
           item.materielName =
-            item.materieEncoding +
+            // item.materieEncoding +
             item.materieColorNumber +
             item.specificationModel;
         });
@@ -997,6 +997,8 @@ export default {
           );
           this.excuteBtnArr[0].children.push({
             btnName: "采购单详情",
+            btnHasPermi:"huaxian:cggl:yclcg:INSERT",
+            btnGroupType:"right",
             btnType: "viewPurchaseOrderDetails",
             btnIcon: "el-icon-edit",
             btnShowCondition: "",
@@ -1004,12 +1006,15 @@ export default {
           });
           this.excuteBtnArr[0].children.push({
             btnName: "采购修改",
+            btnHasPermi:"huaxian:cggl:yclcg:INSERT",
+            btnGroupType:"right",
             btnType: "caiGouUpdate",
             btnIcon: "el-icon-edit",
             btnShowCondition:
               '[{"fieldName":"purchase.data_approval_status","mark":"6","refValue":"0"}]',
             children: [],
           });
+          console.log("this.excuteBtnArr------------------",this.excuteBtnArr)
           this.topBtnArr = res.data.resultMap.button?.filter(
             (item) => item.btnGroupType == "top"
           );

zkqy-ui/src/views/orderMange/requisitionOrders/approval.vue

@@ -142,9 +142,9 @@
               <el-select v-model="scope.row.materialId" filterable placeholder="请选择物料" disabled>
                 <el-option
                   v-for="mtem in materielList"
-                  :key="mtem.id"
-                  :label="mtem.materielName"
-                  :value="mtem.id">
+                  :key="mtem.materialId"
+                  :label="mtem.materieEncoding+'_'+mtem.materielName"
+                  :value="mtem.materielCode">
                 </el-option>
               </el-select>
             </template>
@@ -250,6 +250,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getTaskList();
   },
   methods: {
     /** 查询领料单列表 */
@@ -264,7 +265,7 @@ export default {
     /** 查询可领料任务 */
     getTaskList() {
       materialRequisitionTaskList().then(response => {
-        console.log(response)
+        console.log("---------------",response.rows)
         this.taskList = response.rows;
       });
     },
@@ -396,6 +397,7 @@ export default {
     toExamine(row) {
       this.reset();
       const id = row.id || this.ids
+      this.getMaterielList();
       getRequisitionOrders(id).then(response => {
         if (response.data.requistionOrdersType == 1) {
           // 退料
@@ -403,7 +405,7 @@ export default {
         }
         this.form = response.data;
         this.requisitionItemsList = response.data.requisitionItemsList;
-        this.form.value = this.form.taskCode;
+        this.form.value = parseInt(this.form.taskCode);
         this.open = true;
         this.title = this.form.createBy + "的单据";
       });

zkqy-ui/src/views/orderMange/requisitionOrders/index.vue

@@ -183,8 +183,12 @@
             <el-form-item :label="requistionOrdersType?'退料任务':'领料任务'" prop="taskCode">
               <el-select v-model="form.taskCode" filterable placeholder="请选择任务" :disabled="isUpdate?true:requistionState?true:false"
                          @change="handleRequistionState(form.requistionOrdersType)" style="width:300px">
-                <el-option v-for="item in taskList" :key="item.saleProductsId" :label="item.saleProductsSaleOrderNo+'-'+item.saleProductsTaskName+'-'+item.saleProductsProductNumber"
-                           :value="item.saleProductsId"></el-option>
+                <el-option v-for="item in taskList"
+                           :key="item.saleProductsId"
+                           :label="item.saleProductsSaleOrderNo+'-'+item.saleProductsTaskName+'-'+item.saleProductsProductNumber"
+                           :value="item.saleProductsId">
+
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>