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

i18n/locale/zh-CN.js

@@ -1655,6 +1655,8 @@ export default {
     remark: '备注',
     storeId: '库位id',
     storeTitle: '库位名称',
-    stockCode: '物料序号'
+    stockCode: '物料序号',
+    count1:"可申请数",
+    count2:"申请数"
   }
 }

pages/aps/plan/detailAccessory.vue

@@ -10,7 +10,7 @@
       <Content>
         <div class="mb20" v-for="(item,index) in datas" :key="index">
           <p class="fwBold" :id="'item'+index">
-            <span >申请编号：{{item.code}}</span>
+            <span>申请编号：{{item.code}}</span>
             <span class="ml20">齐套日期：{{item.finishDate}}</span>
             <span class="ml20">申请人：{{item.creator}}</span>
             <span class="ml20">申请时间：{{item.applyTime}}</span>
@@ -68,7 +68,7 @@ export default {
         },
         {
           key: "count",
-          title: this.l("count"),
+          title: this.l("count2"),
           align: "right",
           width: 120,
         },
@@ -82,10 +82,10 @@ export default {
               "span",
               {
                 style: {
-                  color: this.setName(this.statuList1, params.row.status).color,
+                  color: this.setName(this.statuList, params.row.status).color,
                 },
               },
-              this.setName(this.statuList1, params.row.status).name
+              this.setName(this.statuList, params.row.status).name
             );
           },
         },
@@ -111,7 +111,7 @@ export default {
                     click: () => this.application(0, params.row),
                   },
                 },
-                "撤回"
+                params.row.status == 0 ? "撤回" : ""
               ),
             ]);
           },
@@ -156,9 +156,12 @@ export default {
         parms.push(arr.id);
       } else {
         arr.forEach((ele) => {
+          if (ele.status == 0) {
             parms.push(ele.id);
+          }
         });
       }
+      if (parms.length > 0) {
         Api.batchdelete(parms).then((res) => {
           if (res.success && res.result) {
             this.$Message.success("撤销成功");
@@ -166,6 +169,11 @@ export default {
             this.$emit("on-ok");
           }
         });
+      }
+      else
+      {
+        this.$Message.error("物料无法撤回！")
+      }
     },
     //配套申请
     setName(list, v) {

pages/aps/plan/editAccessory.vue

@@ -176,17 +176,11 @@ export default {
         },
         {
           key: "count",
-          title: this.l("count"),
+          title: this.l("count1"),
           align: "right",
           slot: "counts",
           width: 120,
         },
-        {
-          key: "outStockNumber",
-          title: this.l("outStockNumber"),
-          align: "right",
-          width: 120,
-        },
         {
           key: "remark",
           title: this.l("remark"),

pages/aps/plan/index.vue

@@ -808,6 +808,11 @@ export default {
       return outPar
     },
     openAccessory(row) {
+      if(row.mainRoutingSetStatus!=1)
+      {
+        this.$Message.error("请设置订单工艺！")
+        return
+      }
       this.orderId = row.id;
       this.mesCode = row.mesCode;
       this.productName = row.productName;

pages/aps/supprotMain/index.vue

@@ -12,7 +12,7 @@
         </Form>
       </template>
     </DataGrid>
-    <Modal v-model="modal" :title="title" width="1200" fullscreen footer-hide>
+    <Modal v-model="modal" :title="title" width="1200" fullscreen footer-hide @on-cancel="ok">
       <component :is="detail" :eid="curId" :row="entity" @on-close="cancel" @on-ok="ok" />
     </Modal>
   </div>
@@ -104,7 +104,8 @@ export default {
                 "op",
                 {
                   attrs: { oprate: "edit" },
-                  on: { click: () => this.getOutBound(params.row) },
+                  style:{color:params.row.status==0?"#bebebe":""},
+                  on: { click: () => params.row.status!=0?this.getOutBound(params.row):null },
                 },
                 "出库单"
               ),

pages/aps/supprotMain/outbound.vue

@@ -7,7 +7,7 @@
       <span class="ml20">申请时间：{{row.creationTime}}</span>
       <span class="ml20">
         状态：
-        <state code="outstore.status" :value="row.status+''" type="text"></state>
+       <state code="accessory.status" :value="row.status+''" type="text"></state>
       </span>
     </p>
     <Card :padding="0">
@@ -20,6 +20,7 @@
           class="fr"
           size="small"
           @click="openMore"
+          v-show="tempList.length>1"
         >{{butTxt}}</Button>
       </div>
       <Table
@@ -237,12 +238,11 @@ export default {
           //this.datas = r.result.children;
           this.tempList = r.result.children;
           this.datas = this.tempList.slice(0, 1);
-          this.tableHeight1 = "96";
+          this.tableHeight1 = "97";
           this.butTxt = "更多";
           this.iconLabel = "md-arrow-dropdown";
 
-          let parm = { orderId: r.result.orderId };
-          this.orderId = r.result.orderId;
+          let parm = { supportMainId : v };
           this.curRowId = 0;
           Api.listbysupportitem(parm).then((res) => {
             if (res.success) {
@@ -305,7 +305,7 @@ export default {
         this.butTxt = "收起";
         this.iconLabel = "md-arrow-dropup";
       } else {
-        this.tableHeight1 = "96";
+        this.tableHeight1 = "97";
         this.butTxt = "更多";
         this.iconLabel = "md-arrow-dropdown";
         this.datas = this.tempList.slice(0, 1);