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

components/page/dataGrid.vue

@@ -450,7 +450,7 @@ export default {
     },
     selectAll(status) {
       this.$refs.table.selectAll(status)
-    }
+    },
   },
   computed: {
     columnsNow() {

i18n/locale/zh-CN.js

@@ -897,7 +897,7 @@ export default {
         part_task_pk: '计划编号',
         priority: '优先级',
         plan_qty: '排产数量',
-        spare_qty: '',
+        spare_qty: '备件数量',
         plan_start: '计划排产开始',
         plan_finish: '计划排产结束',
         notes: '备注',

pages/aps/aps/components/excute.vue

@@ -422,7 +422,7 @@ export default {
     l(key) {
       let vkey = "mes_op_task_plan_simulate" + "." + key;
       return this.$t(vkey) || key;
-    }
+    },
   }
 };
 </script>

pages/aps/aps/index.vue

@@ -155,6 +155,7 @@ export default {
           title: this.l("plan_start"),
           align: "center",
           high: true,
+          hide: true,
           resizable: true,
           width: 140
         },
@@ -163,6 +164,7 @@ export default {
           title: this.l("plan_finish"),
           align: "center",
           high: true,
+          hide: true,
           sortable: true,
           resizable: true,
           width: 140
@@ -179,9 +181,8 @@ export default {
           key: "demand_start",
           title: this.l("demand_start"),
           align: "center",
-          hide: true,
           resizable: true,
-          width: 100
+          width: 140
         },
         {
           key: "demand_finish",
@@ -195,7 +196,8 @@ export default {
           key: "badjustflag",
           title: this.l("badjustflag"),
           align: "left",
-          high: true
+          high: true,
+          hide:true,
         },
         {
           title: "操作",
@@ -368,19 +370,27 @@ export default {
       Api.orderpriority(parmsOrderpriority).then(res => {
         if (res.success) {
           if (res.result) {
-            this.$Message.success("排序成功");
+            //this.$Message.success("排序成功");
             //apsp排产前检查
             Api.apsdatachecked().then(res1 => {
               if (res1.success) {
                 if (res1.result.res) {
-                  this.$Message.success("数据校验成功");
+                 // this.$Message.success("数据校验成功");
                   //排产计算
                   let paramsTime = {
                     setTime: this.entity.setTime
                   };
                   Api.apsprepareandcalc(paramsTime).then(res2 => {
                     if (res2.success) {
+                      if (res2.result.res) {
                         this.$Message.success("排产计算成功");
+                        this.$router.push({
+                          name: "aps-results"
+                          // params: { customerId: id }
+                        });
+                      } else {
+                        this.$Message.error(res2.result.msg);
+                      }
                     } else {
                       this.$Message.error("操作失败：排产计算");
                     }

pages/bug/component/add.vue

@@ -101,7 +101,7 @@ export default {
   methods: {
     initial() {
       this.bugForm.pagePath = window.location.href
-      this.bugForm.createor = localStorage.getItem('userName')
+      this.bugForm.createor = this.$store.state.userInfo.userName
     },
     //初始化编辑信息
     editeInfo(value) {
@@ -150,7 +150,7 @@ export default {
         pagePath: window.location.href,
         content: '',
         imgPaths: [],
-        createor: localStorage.getItem('userName'),
+        createor: this.$store.state.userInfo.userName,
         level: 1,
         name: ''
       }

pages/bug/index.vue

@@ -330,9 +330,7 @@ export default {
     //选项卡切换
     tab(data) {
       if (data == '0') {
-        this.easySearch.creatorUserId.value = JSON.parse(
-          sessionStorage.getItem('userInfo')
-        ).userId
+        this.easySearch.creatorUserId.value = this.$store.state.userInfo.userId
       } else {
         this.easySearch.creatorUserId.value = null
       }
@@ -349,7 +347,7 @@ export default {
     //修改事件
     addSave() {
       let param = this.$refs.edit.addBugInfo()
-      param.auditUser = localStorage.getItem('userName')
+      param.auditUser = this.$store.state.userInfo.userName
       if (param.id != null) {
         //增加确定
         this.$http.bug.createorupdate(param).then((res) => {
@@ -373,7 +371,7 @@ export default {
     //确定/关闭操作
     detailSave() {
       let param = this.$refs.detail.addBugInfo()
-      param.auditUser = localStorage.getItem('userName')
+      param.auditUser = this.$store.state.userInfo.userName
       param.ids = [param.id]
       if (param.id != null) {
         //增加确定
@@ -398,7 +396,7 @@ export default {
       } else {
         param = this.$refs.detail.addBugInfo()
       }
-      param.auditUser = localStorage.getItem('userName')
+      param.auditUser = this.$store.state.userInfo.userName
       param.ids = [param.id]
       param.statusNew = 5
       if (param.id != null) {
@@ -440,7 +438,7 @@ export default {
         //this.showBt = false
         this.selectBatch = 100
       }
-      this.listBatch.auditUser = localStorage.getItem('userName')
+      this.listBatch.auditUser = this.$store.state.userInfo.userName
     },
     //批量操作
     statuChange(value) {

pages/mordent/andon/parameter/component/add.vue

@@ -85,7 +85,7 @@ export default {
   methods: {
     initial() {
       this.bugForm.pagePath = window.location.href
-      this.bugForm.createor = localStorage.getItem('userName')
+      this.bugForm.createor = this.$store.state.userInfo.userName
     },
     //初始化编辑信息
     editeInfo(value) {

pages/mordent/andon/parameter/index.vue

@@ -345,7 +345,7 @@ export default {
         //this.showBt = false
         this.selectBatch = 100
       }
-      this.listBatch.auditUser = localStorage.getItem('userName')
+      this.listBatch.auditUser = this.$store.state.userInfo.userName
     },
     canselFooter() {
       this.footerBar = false

pages/processDesign/ChangeSingle/technicalcoordination/index.vue

@@ -472,7 +472,7 @@ export default {
       this.formdata.change_process_file = "";
       this.formdata.compilation_temporary_process = "";
       this.formdata.inspection_date = "";
-      this.formdata.inspection_person_name = localStorage.getItem("userName");
+      this.formdata.inspection_person_name = this.$store.state.userInfo.userName;
       this.formdata.status = 1;
       this.formdata.note = "";
 
@@ -489,10 +489,7 @@ export default {
       var url = `${designUrl}/technicalcoordination/createorupdate`;
 
       service
-        .post(
-          `${url}`,
-          JSON.stringify({ technicalCoordination: this.formdata })
-        )
+        .post(          `${url}`,{ technicalCoordination: this.formdata }        )
         .then(res => {
           if (res.success) {
             this.loadchangelist();

pages/processDesign/ChangeSingle/unqualifiedorder/index.vue

@@ -485,7 +485,7 @@ export default {
     saveOk() {
       var url = `${designUrl}/unqualifiedorder/createorupdate`;
       service
-        .post(`${url}`, JSON.stringify({ unqualifiedOrder: this.formdata }))
+        .post(`${url}`, { unqualifiedOrder: this.formdata })
         .then(res => {
           console.log(res);
           if (res.success) {

pages/processDesign/ProcessRecord/index.vue

@@ -336,7 +336,7 @@ export default {
         file: this.formItem.file
       }
       service
-        .post(`${url}`, JSON.stringify({ processRecord: paramsdata }))
+        .post(`${url}`, { processRecord: paramsdata })
         .then((res) => {
           if (res.success) {
             this.laodaction()

pages/processDesign/productTree/addclass.vue

@@ -34,7 +34,7 @@ export default {
   name: 'add',
   data() {
     return {
-      formValidate: { name: '',upid:'', upname: '',disabled:false },
+      formValidate: { name: '',upid:'', upname: '',disabled:false ,isProduct:0},
       ruleValidate: {
         name: [{ required: true }]
       },

pages/processDesign/productTree/index.vue

@@ -454,7 +454,7 @@ export default {
           }
           var url = `${designUrl}/productinfo/createorupdate`;
           service
-            .post(`${url}`, JSON.stringify({ ProductInfo: this.formValidate0 }))
+            .post(`${url}`, { ProductInfo: this.formValidate0 })
             .then(response => {
               if (response.success) {
                 this.$Message.success("保存成功");
@@ -642,8 +642,7 @@ export default {
           this.formValidate1 = this.$refs.addclass.formValidate;
           service
             .post(
-              `${url}`,
-              JSON.stringify({ ProductLevel: this.formValidate1 })
+              `${url}`,{ ProductLevel: this.formValidate1 }
             )
             .then(response => {
               if (response.result.status) {

pages/processDesign/setProcess/index.vue

@@ -1504,7 +1504,7 @@ export default {
       var url = `${PlanUrl}/OrderMaterial/createorupdate`
       // JSON.stringify({Process:this.formValidate})
       service
-        .post(`${url}`, JSON.stringify({ orderMaterial: this.formValidate }))
+        .post(`${url}`,{ orderMaterial: this.formValidate })
         .then((response) => {
           if (response.success) {
             this.$Message.success('保存成功')

pages/qcimplement/components/backCheck.vue

@@ -113,7 +113,7 @@ export default {
       this.mod.routingHeaderId = entryModel.routingHeaderId
       this.mod.routingDetailId = entryModel.routingDetailId
 
-      this.mod.checkName = localStorage.getItem('userName')
+      this.mod.checkName = this.$store.state.userInfo.userName
       this.mod.check_Status = 3
       this.product_code = ''
       this.board_code = ''

pages/resource/Store/add.vue

@@ -86,7 +86,6 @@ export default {
         user_ids: this.entity.user_ids.join(',') //库管员id
       }
       console.log(paramsdata)
-      // JSON.stringify({ storeroomLocation: paramsdata })
       Api.create({ storeroomLocation: paramsdata }).then(
         (r) => {
           this.disabled = false

pages/resource/resource/return.vue

@@ -107,7 +107,7 @@ export default {
       },
       resource: [],
       selectList: [],
-      libraryTube: localStorage.getItem('userName') //库管员
+      libraryTube: this.$store.state.userInfo.userName //库管员
     }
   },
   props: {},

pages/resourceManagement/EquipmentCalendar/components/newEquipment.vue

@@ -149,7 +149,7 @@ export default {
        console.log(this.formItem1)
           console.log(this.formItem2)
           console.log(this.editId)
-      service.post(`${url}`, JSON.stringify({ equipCalendarWork: this.formItem1,equipCalendarOverTime: this.formItem2 }))
+      service.post(`${url}`,{ equipCalendarWork: this.formItem1,equipCalendarOverTime: this.formItem2 })
         .then((res) => {
 
           if (res.success) {

pages/resourceManagement/EquipmentCalendar/index.vue

@@ -812,7 +812,7 @@ export default {
       };
       console.log(paramsdata);
       service
-        .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
+        .post(`${url}`,{equipMaintainPlan: paramsdata })
         .then(res => {
           if (res.success) {
             this.changestatus(this.eid);
@@ -854,7 +854,7 @@ export default {
       };
       console.log(paramsdata);
       service
-        .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
+        .post(`${url}`,{equipMaintainPlan: paramsdata })
         .then(res => {
           if (res.success) {
             this.changestatus(this.eid);
@@ -1000,7 +1000,7 @@ export default {
       };
       console.log(paramsdata);
       service
-        .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
+        .post(`${url}`,{equipMaintainPlan: paramsdata })
         .then(res => {
           if (res.success) {
             this.changestatus(this.eid);

pages/resourceManagement/Storehouse/index.vue

@@ -350,7 +350,7 @@ export default {
       }
       console.log(paramsdata)
       service
-        .post(`${url}`, JSON.stringify({ storeroomLocation: paramsdata }))
+        .post(`${url}`, { storeroomLocation: paramsdata })
         .then((res) => {
           if (res.success) {
             this.laodaction()
@@ -391,7 +391,7 @@ export default {
             }
             // this.limtList = 
             service
-              .post(`${url}`, JSON.stringify({ storeroomLocation: paramsdata }))
+              .post(`${url}`,{ storeroomLocation: paramsdata })
               .then((res) => {
                 if (res.success) {
                   this.laodaction()
@@ -414,7 +414,7 @@ export default {
               user_ids: this.formItem02.Storekeeper.join(',') //库管员
             }
             service
-              .post(`${url}`, JSON.stringify({ storeroomLocation: paramsdata }))
+              .post(`${url}`, { storeroomLocation: paramsdata })
               .then((res) => {
                 if (res.success) {
                   this.laodaction()

pages/resourceManagement/deviceManagement/index.vue

@@ -869,7 +869,7 @@ export default {
       }
       console.log(paramsdata)
       service
-        .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
+        .post(`${url}`, { equipMaintainPlan: paramsdata })
         .then((res) => {
           if (res.success) {
             this.changestatus(this.eid)
@@ -911,7 +911,7 @@ export default {
       }
       console.log(paramsdata)
       service
-        .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
+        .post(`${url}`, { equipMaintainPlan: paramsdata })
         .then((res) => {
           if (res.success) {
             this.changestatus(this.eid)
@@ -1055,7 +1055,7 @@ export default {
       }
       console.log(paramsdata)
       service
-        .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
+        .post(`${url}`, { equipMaintainPlan: paramsdata })
         .then((res) => {
           if (res.success) {
             this.changestatus(this.eid)

pages/resourceManagement/deviceManagementCP/index.vue

@@ -898,7 +898,7 @@ export default {
       }
       console.log(paramsdata)
       service
-        .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
+        .post(`${url}`, { equipMaintainPlan: paramsdata })
         .then((res) => {
           if (res.success) {
             this.changestatus(this.eid)
@@ -940,7 +940,7 @@ export default {
       }
       console.log(paramsdata)
       service
-        .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
+        .post(`${url}`, { equipMaintainPlan: paramsdata })
         .then((res) => {
           if (res.success) {
             this.changestatus(this.eid)
@@ -1088,7 +1088,7 @@ export default {
       }
       console.log(paramsdata)
       service
-        .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
+        .post(`${url}`, { equipMaintainPlan: paramsdata })
         .then((res) => {
           if (res.success) {
             this.changestatus(this.eid)

pages/resourceManagement/deviceType/index.vue

@@ -239,7 +239,7 @@ export default {
           notes: this.formItem.notes
         };
         service
-          .post(`${url}`, JSON.stringify({ equipType: paramsdata }))
+          .post(`${url}`,{ equipType: paramsdata })
           .then(res => {
             if (res.success) {
               this.laodaction();
@@ -264,7 +264,7 @@ export default {
           notes: this.formItem.notes
         };
         service
-          .post(`${url}`, JSON.stringify({ equipType: paramsdata }))
+          .post(`${url}`,{equipType: paramsdata })
           .then(res => {
             if (res.success) {
               this.laodaction();