Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

i18n/locale/zh-CN.js

@@ -359,8 +359,8 @@ export default {
     productId: '产品id',
     productName: '产品名称',
     quantity: '计划数量',
-   productQuantity: '合格数量',
-    qualifiedQuantity:'合格数量',
+    productQuantity: '合格数量',
+    qualifiedQuantity: '合格数量',
     actualFinishDate: '完成时间',
     productingPreparationPeople: '承制单位',
     uncertificateQuantity: '待开具数量',
@@ -1569,9 +1569,54 @@ export default {
     unitPrice: '单价',
     originalManufacturer: '原厂家',
     remark: '备注',
-    materialCode:'物料编码',
+    materialCode: '物料编码',
   },
-  stock_item:{
+  stock_item: {
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '更新时间',
+    lastModifierUserId: '更新人',
+    isDeleted: '删除人',
+    deletionTime: '删除时间',
+    deleterUserId: '删除人',
+    name: '名称',
+    materialType: '类型',
+    brand: '牌号',
+    specifications: '规格',
+    originalManufacturer: '原厂家',
+    batch: '批次',
+    unitPrice: '单价',
+    certificateOfApproval: '合格证',
+    storeId: '',
+    storeTitle: '库位',
+    creator: '',
+    stockId: '物料库存主键',
+    total: '入库数量',
+    remark: '备注',
+    code: '入库编号',
+    materialId: '物料id',
+    materialCode: '物料编码',
+    nowTotal: '剩余数量',
+  },
+  support_main: {
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '更新时间',
+    lastModifierUserId: '更新人',
+    isDeleted: '删除人',
+    deletionTime: '删除时间',
+    deleterUserId: '删除人',
+    orderId: '订单id',
+    productName: '产品名称',
+    drawnNumber: '图号',
+    count: '订单数量',
+    creator: '申请人',
+    status: '状态',
+    finishDate: '齐套时间',
+    orderCode: '订单编号',
+    code: '申请单号',
+  },
+  support_item:{
     creationTime:'创建时间',
     creatorUserId:'创建人',
     lastModificationTime:'更新时间',
@@ -1579,23 +1624,22 @@ export default {
     isDeleted:'删除人',
     deletionTime:'删除时间',
     deleterUserId:'删除人',
-    name:'名称',
-    materialType:'类型',
-    brand:'牌号',
-    specifications:'规格',
-    originalManufacturer:'原厂家',
-    batch:'批次',
-    unitPrice:'单价',
-    certificateOfApproval:'合格证',
-    storeId:'',
-    storeTitle:'库位',
-    creator:'',
-    stockId:'物料库存主键',
-    total:'入库数量',
-    remark:'备注',
-    code:'入库编号',
+    supportMainId:'主表id',
+    routingHeaderId:'工艺id',
+    routingDeatilId:'工序id',
+    routingDetailName:'工序',
+    routingDetailSeq:'工序号',
+    routingDetailNo:'工序号',
+    count:'申请数量',
+    status:'状态',
     materialId:'物料id',
-    materialCode:'物料编码',
-    nowTotal:'剩余数量',
+    materialName:'物料名称',
+    nameMaterial:'物料名称',
+    materialNumber:'物料编号',
+    needCount:'需要数量',
+    totalCount:'需要数量',
+    outStockNumber:'出库数量',
+    orderId:'',
+    remark:'备注',
          }
 }

pages/aps/plan/addAccessory.vue

@@ -23,14 +23,14 @@
       >
         <template slot-scope="{ row, index }" slot="counts">
           <InputNumber
-            :max="row.materialCount"
+            :max="row.totalCount"
             :min="0"
             v-model="row.count"
             @on-blur="inputChange1(i,row,index)"
           />
         </template>
         <template slot-scope="{ row, index }" slot="remarks">
-          <Input type="text" v-model="row.remarks" @on-blur="inputChange1(i,row,index)" />
+          <Input type="text" v-model="row.remark" @on-blur="inputChange1(i,row,index)" />
         </template>
       </Table>
     </div>
@@ -72,39 +72,39 @@ export default {
         },
         {
           key: "routingDetailNo",
-          title: "工序号",
+          title: this.l("routingDetailNo"),
           align: "left",
         },
         {
           key: "routingDetailName",
-          title: "工序",
+          title: this.l("routingDetailName"),
           align: "left",
         },
         {
           key: "nameMaterial",
-          title: "物料名",
+          title: this.l("nameMaterial"),
           align: "left",
         },
         {
           key: "materialNumber",
-          title: "物料编号",
+          title: this.l("materialNumber"),
           align: "left",
         },
         {
-          key: "materialCount",
-          title: "需求数量",
+          key: "totalCount",
+          title: this.l("totalCount"),
           align: "left",
         },
         {
-          key: "counts",
-          title: "申请数量",
+          key: "count",
+          title: this.l("count"),
           align: "right",
           slot: "counts",
           width: 120,
         },
         {
-          key: "remarks",
-          title: "备注",
+          key: "remark",
+          title: this.l("remark"),
           align: "left",
           slot: "remarks",
         },
@@ -155,14 +155,13 @@ export default {
           r.result.forEach((e) => {
             let i = 0;
             e.suport.forEach((el) => {
-              el.count = el.materialCount;
+              el.count = el.totalCount;
               el._checked = true;
               el._index = i++;
-              //el._disabled=true
             });
           });
           this.datas = r.result;
-          //----测试多个工艺start
+          //----测试多个工艺start----
           // let temre = this.$u.clone(r.result);
           // temre.forEach((ele) => {
           //   ele.routingHeaderId = 281;
@@ -173,15 +172,10 @@ export default {
           //   });
           // });
           // this.datas = r.result.concat(temre);
-          //----测试多个工艺end
+          //----测试多个工艺end----
         }
       });
     },
-
-    l(key) {
-      let vkey = "plan_resource" + "." + key;
-      return this.$t(vkey) || key;
-    },
     getTimeQuotationFD(value) {
       this.orderForm.QuotationFinishDate =
         value != "" ? this.getFormatDateEnd(value) : value;
@@ -222,44 +216,16 @@ export default {
           this.$set(this.datas[v].suport, index, ele);
         });
       }
-
-      // if (this.curArr.length == 0) {
-      //   //取消全部时
-      //   let temc = this.$u.clone(this.selectItems);
-      //   let temb = this.delByHeadId(temc, v);
-      //   this.selectItems = [];
-      //   this.selectItems = temb;
-      //   this.footerToolbar = this.selectItems.length > 0;
-      //   //alert("this.selectAllCancel___" + JSON.stringify(this.selectItems));
-      // }
     },
     selectList(items, row) {
       this.curArr = 1;
-      //this.selectItems.push(row);
-      // alert("this.selectItems___" + JSON.stringify(this.selectItems));
-      //this.footerToolbar = this.selectItems.length > 0;
       this.cRow = row;
     },
     selectListAll(items) {
       this.curArr = 2;
-      // let tema = this.selectItems.concat(items);
-      // let temo = this.delSame(tema);
-      // this.selectItems = [];
-      // this.selectItems = temo;
-      //alert("this.selectListAlls___" + JSON.stringify(this.selectItems));
-      // this.footerToolbar = this.selectItems.length > 0;
     },
     selectListCancel(items, row) {
       this.curArr = 3;
-      // let tempSelectItems = this.$u.clone(this.selectItems);
-      //let delId = row.id;
-      // let arrs = this.delById(tempSelectItems, delId);
-      // this.selectItems = [];
-      // this.selectItems = arrs;
-      //alert("this.selectListCancel___" + JSON.stringify(this.selectItems));
-      //this.footerToolbar = this.selectItems.length > 0;
-
-      // this.$set(this.datas[i].suport, index, row);
       this.cRow = row;
     },
     selectAllCancel(items) {
@@ -317,7 +283,7 @@ export default {
                   materialId: ele.materialId,
                   materialName: ele.nameMaterial,
                   materialNumber: ele.materialNumber,
-                  needCount: ele.materialCount,
+                  needCount: ele.totalCount,
                   count: ele.count, //
                   remark: ele.remark ? ele.remark : "",
                 };
@@ -343,7 +309,7 @@ export default {
               if (res.success) {
                 this.$Message.success("申请成功");
                 //this.$emit("cancel");
-                this.$emit('on-ok')
+                this.$emit("on-ok");
               }
             });
           }
@@ -359,6 +325,10 @@ export default {
       });
       this.footerToolbar = false;
     },
+    l(key) {
+      let vkey = "support_item" + "." + key;
+      return this.$t(vkey) || key;
+    },
   },
   watch: {
     eid(v) {

pages/aps/plan/api.js

@@ -53,5 +53,9 @@ export default {
     batchdelete(params){//批量撤回
         return Api.post(`${technologyUrl}supportitem/batchdelete`, params);
     },
+    matchdetaillist(params){//配套审核单列表
+        return  Api.get(`${technologyUrl}materiallist/matchdetaillist`, params);
+    },
+    
    
 }
\ No newline at end of file

pages/aps/plan/detailAccessory.vue

@@ -19,13 +19,13 @@
         </div>
       </Content>
       <Sider hide-trigger style="background:#fff;color:black;" width="300">
-        <Collapse value="1" class="mt20" style="position:fixed;width:260px">
+        <Collapse value="1" class="mt20 ml20" style="position:fixed;width:260px">
           <Panel name="1">
             申请记录
-            <div slot="content" class="pl30 pb10 lh25">
+            <div slot="content" class="pl20 pb10 lh25">
               <p v-for="(items,i) in datas" :key="i">
                 <a :href="'#item'+i">
-                  <span>{{items.applyTime.substring(0,10)}}</span>
+                  <span>{{items.applyTime}}</span>
                   <span class="fr mr10">{{items.creator}}</span>
                 </a>
               </p>
@@ -50,39 +50,39 @@ export default {
       cols: [
         {
           key: "materialName",
-          title: "物料名",
+          title: this.l("materialName"),
           align: "left",
         },
         {
           key: "materialNumber",
-          title: "物料编号",
+          title: this.l("materialNumber"),
           align: "left",
         },
         {
           key: "needCount",
-          title: "需求数量",
+          title: this.l("needCount"),
           align: "right",
         },
         {
           key: "count",
-          title: "申请数量",
+          title: this.l("count"),
           align: "right",
           width: 120,
         },
         {
-          key: "counts",
-          title: "状态",
+          key: "status",
+          title: this.l("status"),
           align: "center",
           width: 120,
         },
         {
           key: "remark",
-          title: "备注",
+          title: this.l("remark"),
           align: "left",
         },
         {
           key: "action",
-          title: "状态",
+          title: "操作",
           width: 120,
           align: "center",
           render: (h, params) => {
@@ -148,10 +148,15 @@ export default {
         if(res.success&&res.result)
         {
           this.$Message.success("撤销成功");
+          this.load(this.eid);
           this.$emit('on-ok')
         }
       })
     },
+     l(key) {
+      let vkey = "support_item" + "." + key;
+      return this.$t(vkey) || key;
+    },
   },
   watch: {
     eid(v) {

pages/aps/plan/index.vue

@@ -244,8 +244,8 @@ export default {
                 },
               },
               this.setName(params.row.isSupportingFinish).name
-            );
-          },
+            )
+          }
         },
         {
           key: "projectNumber",
@@ -805,7 +805,7 @@ export default {
           };
         } 
       }
-      return outPar;
+      return outPar
     },
     openAccessory(row) {
       this.orderId = row.id;
@@ -817,8 +817,8 @@ export default {
         this.title = "申请配套";
         this.details = () => import("./addAccessory");
       } else {
-        this.title = "申请单";
-        this.details = () => import("./detailAccessory");
+        this.title = "配套清单";
+        this.details = () => import("./editAccessory");
       }
 
       this.modalAccessory = true;