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

i18n/locale/zh-CN.js

@@ -1019,9 +1019,13 @@ export default {
     },
     mes_op_task_plan_simulate: {  //参数设置的表
         id: '',
+        // partTaskPk: 订单ID,
+        // opTaskPk: 工单ID,
+        flog: 0,//参数应用
+        planMethod: "转序规则", // 平行 重叠
         op_task_pk: '工单编号',
         part_task_pk: '计划编号',
-        task_seq: '工序号',
+        taskSeq: '工序号',
         task_name: '工序名称',
         put_into_qty: '投产数量',
         plan_start: '计划排产开始',
@@ -1030,21 +1034,23 @@ export default {
         run_time: '单件工时',
         transport_time: '转运时间',
         check_time: '检验时间',
-        efficiency_value: '效率系数',
+        efficiencyValue: '效率系数',
         singleout: '单件产出',
         first_equip: '设备编号',
         equip_type: '设备类型',
-        cal_id: '连班策略',
+        calId: '连班策略',
         machine_rule: '设备优先规则',
         plan_method: '重叠转序',
-        over_time: '六日加班',
-        isdiscrete: '是否离散',
-        discrete_value: '离散值',
+        overTime: '六日加班',
+        isDiscrete: '是否离散',
+        discrete: '离散值',
         multi_machine: '多台分配',
         notes: '备注',
         insert_flag: '插单',
         outside_time: '外协时间',
         discrete_percent: '离散百分比%',
+        multipleEquip: "是否多台安排设备",// 否  是
+        multipleEquipIds: "设备id", //用英文逗号分隔
         taskseq_des: '',
         workshopcode: '',
         routing_detail_id: '',
@@ -1052,44 +1058,44 @@ export default {
         comb_param: '',
         rule_qty: '',
     },
-    routing_header:{
-        id:'',
-        creationTime:'',
-        creatorUserId:'',
-        lastModificationTime:'',
-        lastModifierUserId:'',
-        deleterUserId:'',
-        deletionTime:'',
-        classId:'类id',
-        unicode:'unicode',
-        name:'工艺名称',
-        code:'工艺编号',
-        productId:'产品id',
-        productName:'产品名称',
-        productCode:'产品图号',
-        version:'工艺文件版本',
-        author:'编制人',
-        departmentId:'',
-        isMain:'',
-        upId:'',
-        upDetailId:'',
-        routingType:'工艺类型',
-        status:'',
-        approvalStatus:'状态',
-        remark:'工艺说明',
-        roufile:'多媒体附件',
-        approvalStatusRemark:'',
-        auditUserId1:'审核人',
-        auditUserId2:'审批人',
-        isDeleted:'',
-        platesnum:'',
-        isEffect:'',
-        developmentMode:'研制方式',
-        changeOrderCode:'更改单编号',
-        changeOrderDate:'更改单日期',
-        changeMethod:'更改办法',
-        taskType:'任务类型',
-             },
+    routing_header: {
+        id: '',
+        creationTime: '',
+        creatorUserId: '',
+        lastModificationTime: '',
+        lastModifierUserId: '',
+        deleterUserId: '',
+        deletionTime: '',
+        classId: '类id',
+        unicode: 'unicode',
+        name: '工艺名称',
+        code: '工艺编号',
+        productId: '产品id',
+        productName: '产品名称',
+        productCode: '产品图号',
+        version: '工艺文件版本',
+        author: '编制人',
+        departmentId: '',
+        isMain: '',
+        upId: '',
+        upDetailId: '',
+        routingType: '工艺类型',
+        status: '',
+        approvalStatus: '状态',
+        remark: '工艺说明',
+        roufile: '多媒体附件',
+        approvalStatusRemark: '',
+        auditUserId1: '审核人',
+        auditUserId2: '审批人',
+        isDeleted: '',
+        platesnum: '',
+        isEffect: '',
+        developmentMode: '研制方式',
+        changeOrderCode: '更改单编号',
+        changeOrderDate: '更改单日期',
+        changeMethod: '更改办法',
+        taskType: '任务类型',
+    },
     routing_detail: {
         id: '',
         creationTime: '创建时间',
@@ -1174,30 +1180,30 @@ export default {
         stepContent: '工步内容',
         extend: '扩展字段',
     },
-    routing_qc_card:{
-        id:'',
-        creationTime:'创建时间',
-        creatorUserId:'创建人',
-        lastModificationTime:'修改时间',
-        lastModifierUserId:'修改人',
-        isDeleted:'是否删除',
-        deleterUserId:'删除人',
-        deletionTime:'删除时间',
-        routingHeaderId:'工艺',
-        routingDetailId:'工序',
-        routingStepId:'工步',
-        checkContent:'检验内容',
-        checkType:'检验标记',
-        checkParams:'参数名称',
-        measurementUnit:'单位',
-        fillintype:'汇报类型',
-        qualityTemplate:'模板',
-        isphotograph:'是否拍照',
-        status:'状态',
-        extend:'扩展字段',
-        remark:'备注',
-        productionRequirement:'生产要求',
-        standard:'标准指标',
-        qualityTemplateName:'模板文件名称',
-             }
+    routing_qc_card: {
+        id: '',
+        creationTime: '创建时间',
+        creatorUserId: '创建人',
+        lastModificationTime: '修改时间',
+        lastModifierUserId: '修改人',
+        isDeleted: '是否删除',
+        deleterUserId: '删除人',
+        deletionTime: '删除时间',
+        routingHeaderId: '工艺',
+        routingDetailId: '工序',
+        routingStepId: '工步',
+        checkContent: '检验内容',
+        checkType: '检验标记',
+        checkParams: '参数名称',
+        measurementUnit: '单位',
+        fillintype: '汇报类型',
+        qualityTemplate: '模板',
+        isphotograph: '是否拍照',
+        status: '状态',
+        extend: '扩展字段',
+        remark: '备注',
+        productionRequirement: '生产要求',
+        standard: '标准指标',
+        qualityTemplateName: '模板文件名称',
+    }
 }
\ No newline at end of file

pages/aps/aps/add.vue

@@ -11,33 +11,36 @@
                 <span slot="close">Off</span>
               </i-switch>
             </FormItem>
-            <FormItem :label="l('cal_id')" prop="cal_id">
-              <Select v-model="entity.cal_id" style="width:150px">
-                <Option value="beijing">策略1</Option>
-                <Option value="shanghai">策略2</Option>
-                <Option value="shenzhen">策略3</Option>
+            <FormItem :label="l('calId')" prop="calId">
+              <Select v-model="entity.calId" style="width:150px">
+                <Option
+                  v-for="(item,index) in listCal"
+                  :key="index"
+                  :value="item.calid"
+                  :label="item.calname"
+                ></Option>
               </Select>
             </FormItem>
-            <FormItem :label="l('over_time')" prop="over_time">
-              <i-switch v-model="entity.over_time" size="large">
+            <FormItem :label="l('overTime')" prop="overTime">
+              <i-switch v-model="entity.overTime" size="large">
                 <span slot="open">On</span>
                 <span slot="close">Off</span>
               </i-switch>
             </FormItem>
-            <FormItem :label="l('efficiency_value')" prop="efficiency_value">
-              <Input v-model="entity.efficiency_value" style="width:150px"></Input>
+            <FormItem :label="l('efficiencyValue')" prop="efficiencyValue">
+              <Input v-model="entity.efficiencyValue" style="width:150px"></Input>
             </FormItem>
             <FormItem :label="l('run_time')" prop="run_time">
               <InputNumber v-model="entity.run_time"></InputNumber>
             </FormItem>
-            <FormItem :label="l('isdiscrete')" prop="isdiscrete">
-              <i-switch v-model="entity.isdiscrete" size="large">
+            <FormItem :label="l('isDiscrete')" prop="isDiscrete">
+              <i-switch v-model="entity.isDiscrete" size="large">
                 <span slot="open">On</span>
                 <span slot="close">Off</span>
               </i-switch>
             </FormItem>
-            <FormItem :label="l('discrete_value')" prop="discrete_value">
-              <InputNumber v-model="entity.discrete_value"></InputNumber>
+            <FormItem :label="l('discrete')" prop="discrete">
+              <InputNumber v-model="entity.discrete"></InputNumber>
             </FormItem>
             <FormItem :label="l('discrete_percent')" prop="discrete_percent">
               <InputNumber v-model="entity.discrete_percent"></InputNumber>
@@ -150,40 +153,63 @@
   </div>
 </template>
 <script>
+import Api from "./api";
 export default {
   data() {
     return {
       entity: {
-        value1:100,
-        value2:100,
+        value1: 100,
+        value2: 100,
         fruit: []
       },
+      listCal: [],
       visible: false,
       rules: {
-        businessName: [{ required: true, message: '必填', trigger: 'blur' }],
-        businessCode: [{ required: true, message: '必填', trigger: 'blur' }]
+        businessName: [{ required: true, message: "必填", trigger: "blur" }],
+        businessCode: [{ required: true, message: "必填", trigger: "blur" }]
       }
-    }
+    };
+  },
+  mounted() {
+    this.getCal();
   },
   methods: {
-    handleSubmit() {},
+    getCal() {
+      Api.getallcal().then(res => {
+        if (res.success) {
+          this.listCal = res.result;
+        }
+      });
+    },
+    handleSubmit() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          Api.apsschedulupdateparameter(this.entity).then(res => {
+            if (res.success) {
+            }
+          });
+        } else {
+          this.$Message.error("Fail!");
+        }
+      });
+    },
     handleClose() {
-      this.$emit("on-close")
+      this.$emit("on-close");
     },
     handleOpen() {
-      this.visible = true
+      this.visible = true;
     },
     handle() {
-      this.visible = false
+      this.visible = false;
     },
     handleOk() {},
 
     l(key) {
-      let vkey = 'mes_op_task_plan_simulate' + '.' + key
-      return this.$t(vkey) || key
+      let vkey = "mes_op_task_plan_simulate" + "." + key;
+      return this.$t(vkey) || key;
     }
   }
-}
+};
 </script>
 <style lang="less" scoped>
 .parameter {
@@ -262,7 +288,7 @@ export default {
       color: #2680eb;
     }
     .check-box {
-      height: 300px;
+      height: 348px;
       border-top: 1px solid #e0e0e0;
       padding: 15px;
       padding-left: 0;
@@ -271,7 +297,7 @@ export default {
     }
   }
   .right-down {
-    height: 100px;
+    height: 92px;
   }
   .click-btn {
     text-align: right;

pages/aps/aps/api.js

@@ -56,4 +56,12 @@ export default {
   apsdatachecked(params) {
     return Api.post(`${apsUrl}/apspoolappservices/apsdatachecked`, params);
   },
+  //获取连班策略
+  getallcal(params) {
+    return Api.get(`${apsUrl}/mes_daily_work_sched/getallcal`, params);
+  },
+  //工序参数调整
+  apsschedulupdateparameter(params) {
+    return Api.post(`${apsUrl}/ser/apsschedulupdateparameter`, params);
+  },
 }

pages/basicData/code/index.vue

@@ -65,7 +65,7 @@ export default {
         {
           title: "序号",
           type: "index",
-          width: 60,
+          width: 65,
           align: "center"
         },
         {

pages/implement/components/entryMovie.vue

@@ -212,9 +212,9 @@ export default {
       service
         .post(
           `${url}`,
-          JSON.stringify({
+         {
             orderExecuteMovie: this.datafrom
-          })
+          }
         )
         .then((response) => {
           if (response.success) {

pages/implement/components/entryPause.vue

@@ -193,9 +193,9 @@ export default {
           service
             .post(
               `${url}`,
-              JSON.stringify({
+              {
                 orderExecutePausecause: this.cardModeldata
-              })
+              }
             )
             .then((response) => {
               if (response.success) {

pages/implement/components/entryrecordMovie.vue

@@ -185,9 +185,9 @@ export default {
       service
         .post(
           `${url}`,
-          JSON.stringify({
+          {
             orderExecuteQualityMovie: this.datafrom
-          })
+          }
         )
         .then((response) => {
           if (response.success) {

pages/implement/components/entryrecorddata.vue

@@ -240,9 +240,9 @@ export default {
       service
         .post(
           `${url}`,
-          JSON.stringify({
+          {
             OrderExecuteQualityData: this.datafrom
-          })
+          }
         )
         .then((response) => {
           if (response.success) {

pages/implement/components/entryrecordfiles.vue

@@ -202,9 +202,9 @@ export default {
       service
         .post(
           `${url}`,
-          JSON.stringify({
+          {
             OrderExecuteQualityData: this.datafrom
-          })
+          }
         )
         .then((response) => {
           if (response.success) {

pages/implement/components/processRecord.vue

@@ -202,9 +202,9 @@ export default {
       service
         .post(
           `${url}`,
-          JSON.stringify({
+          {
             orderExecuteFiles: this.cardModeldata
-          })
+          }
         )
         .then((response) => {
           if (response.success) {

pages/implement/components/productReport.vue

@@ -499,11 +499,11 @@ export default {
       service
         .post(
           `${url}`,
-          JSON.stringify({
+          {
             dispatch_id: this.datasearch.entryID,
             order_id: this.datasearch.order_id,
             list: datalist
-          })
+          }
         )
         .then((response) => {
           if (response.success) {

pages/implement/components/sendCheck.vue

@@ -115,7 +115,7 @@ export default {
       if (state) {
         var url = `${PlanUrl}/ordercheckresult/sendcheck`
         service
-          .post(`${url}`, JSON.stringify(this.user))
+          .post(`${url}`, this.user)
           .then((response) => {
             if (response.success) {
               this.$Message.success('保存成功')

pages/implement/components/usercard.vue

@@ -71,7 +71,7 @@ export default {
       }
 
       service
-        .post(`${systemUrl}/user/list`, JSON.stringify(params))
+        .post(`${systemUrl}/user/list`, params)
         .then((response) => {
           if (response.result.length > 0) {
             this.user.user_name = response.result[0].userName
@@ -139,10 +139,10 @@ export default {
             service
               .post(
                 `${url}`,
-                JSON.stringify({
+               {
                   user: this.user,
                   card: this.recordList
-                })
+                }
               )
               .then((response) => {
                 if (response.success) {
@@ -185,7 +185,7 @@ export default {
       }
 
       this.product_ID.push(fillModel.product_ID)
-      console.log(fillModel.board_ID);
+      
       this.board_ID.push(fillModel.board_ID)
       if (
         fillModel.fill_in_user_type == 1 ||
@@ -238,9 +238,10 @@ export default {
     },
     getCurrentUser(e) {
       if (e) {
-        let userInfo = this.$store.admin.user.info;
+        let userInfo = this.$store.state.userInfo;
+       console.log(userInfo);
         this.user.cardno = userInfo.login_id
-        this.user.user_name = localStorage.getItem('userName')
+        this.user.user_name = userInfo.name
         this.user.user_id = userInfo.userId
       } else {
         this.user.cardno = ''

pages/implement/index.vue

@@ -541,11 +541,11 @@ export default {
       service
         .post(
           `${url}`,
-          JSON.stringify({
+          {
             id: row.id,
             orderid: this.data.orderIDs,
             time: null
-          })
+          }
         )
         .then((response) => {
           if (response.success) {
@@ -566,11 +566,11 @@ export default {
       service
         .post(
           `${url}`,
-          JSON.stringify({
+         {
             id: row.id,
             orderid: this.data.orderIDs,
             time: null
-          })
+          }
         )
         .then((response) => {
           if (response.success) {

pages/order/quotation/components/quotationBox.vue

@@ -402,7 +402,7 @@ th.conciseContent .ivu-table-cell {
   padding: 0px !important;
 }
 .ivu-table-cell {
-  padding: 0px !important;
+  /* padding: 0px !important; */
 }
 </style>>
 

pages/order/quotation/index.vue

@@ -458,7 +458,7 @@ export default {
         this.recordColumn = [
           {
             type: "index",
-            width: 60,
+            width: 65,
             title: "序号",
             align: "center"
           },

pages/processManage/setProcess/index.vue

@@ -557,7 +557,7 @@ export default {
               content = gh[0].name
               editColor = gh[0].color
             }
-            if (this.tabstatus == '1') {
+          
               return h('div', [
                 h(
                   'span',
@@ -601,24 +601,7 @@ export default {
                   content
                 )
               ])
-            } else {
-              return h('div', [
-                h(
-                  'span',
-                  {
-                    props: {
-                      type: 'text',
-                      ghost: true
-                    },
-                    style: {
-                      color: editColor,
-                      cursor: 'pointer'
-                    }
-                  },
-                  content
-                )
-              ])
-            }
+           
           }
         },
         
@@ -1414,12 +1397,11 @@ export default {
       this.addpdefm.setshow()
     },
     editProcessRow(params, RoutingID, routingType) {
+    
       let ordercombid = 0
-      if (routingType == 1) {
+    
         ordercombid = params.row.orderCombID
-      } else {
-        ordercombid = params.row.specialtyOrderCombID
-      }
+     
       this.editProcess(ordercombid, RoutingID, routingType, null)
     },
     editProcess(ordercombid, RoutingID, routingType, orders) {
@@ -1434,7 +1416,7 @@ export default {
       let orderlist = new Array()
 
     
-         ordercombid = params.row.orderCombID
+       
        
       this.addpdefm.formValidate.ordercombid = ordercombid
       if (orders == null) {
@@ -1468,10 +1450,7 @@ export default {
       }
       this.addpdefm.dataTop = orderlist
 
-      if (routingType == 1) {
-      
-        
-      }
+     
       if (routingType == 1) {
         this.gymodaltitle = '设置工艺规程'
       } else {

pages/qcimplement/components/backCheck.vue

@@ -92,7 +92,7 @@ export default {
       if (state) {
         var url = `${PlanUrl}/ordercheckresult/savecheckresult`
         service
-          .post(`${url}`, JSON.stringify(this.mod))
+          .post(`${url}`, this.mod)
           .then((response) => {
             if (response.success) {
               this.$Message.success('操作成功')

pages/qcimplement/index.vue

@@ -388,11 +388,11 @@ export default {
       service
         .post(
           `${url}`,
-          JSON.stringify({
+         {
             id: row.id,
             orderid: this.data.orderIDs,
             time: null
-          })
+          }
         )
         .then((response) => {
           if (response.success) {
@@ -413,11 +413,11 @@ export default {
       service
         .post(
           `${url}`,
-          JSON.stringify({
+          {
             id: row.id,
             orderid: this.data.orderIDs,
             time: null
-          })
+          }
         )
         .then((response) => {
           if (response.success) {