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

pages/processManage/Process/processMain.vue

@@ -406,8 +406,7 @@ export default {
       var url =
         `${designUrl}/routingheader/GetListSmall?approvalstatus=1&product_id=` +
         productid +
-        '&routingType=' +
-        this.formValidate.routingType
+        '&routingType=0';
       service.get(`${url}`).then((response) => {
         this.RoutingList = response.result
       })

pages/processManage/setProcess/index.vue

@@ -526,7 +526,7 @@ export default {
 
 
         {
-          title: '主工艺',
+          title: '工艺规程',
           key: 'mainRoutingID',
           width: 120,
           render: (h, params) => {
@@ -610,7 +610,7 @@ export default {
           key: 'materialbillID',
           width: 120,
           render: (h, params) => {
-            if (this.tabstatus == '1') {
+            if (params.row.mainRoutingID == 0) {
               h('div', '')
             } else {
               let id = params.row.id
@@ -1660,6 +1660,8 @@ export default {
 
       ld.orderids = orderids.toString(',')
 
+ld.formValidate.routingHeaderId = params.row.mainRoutingID
+
       ld.formValidate.id = params.row.materialbillID
 
       ld.loaddata()

pages/processManage/setProcess/processMain.vue

@@ -540,8 +540,7 @@ export default {
       var url =
         `${designUrl}/routingheader/GetListSmall?approvalstatus=1&product_id=` +
         productid +
-        "&routingType=" +
-        this.formValidate.routingType;
+        "&routingType=0";
       service.get(`${url}`).then(response => {
         this.RoutingList = response.result;
       });