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

i18n/locale/zh-CN.js

@@ -927,6 +927,7 @@ export default {
   mes_part_task_plan_simulate: {
     id: '',
     part_task_pk: '计划编号',
+    mes_code: '计划编号',
     priority: '优先级',
     plan_qty: '排产数量',
     spare_qty: '备件数量',

pages/aps/aps/add.vue

@@ -118,9 +118,9 @@
                   <InputNumber v-model="entity.efficiencyValue" :step="0.01"></InputNumber>
                 </FormItem>
               </Col>
-              <Col :span="12">
+              <Col :span="12" v-if="opTaskPk>0">
                 <FormItem :label="l('run_time')" prop="run_time">
-                  <span v-text="run_time"></span>
+                  <span v-text="row.run_time"></span>
                 </FormItem>
               </Col>
             </Row>
@@ -284,11 +284,8 @@ export default {
       });
     },
     handleSubmit() {
-      alert(2)
       this.$refs.form.validate(valid => {
-        alert(3)
         if (valid) {
-          alert(4)
           if (
             this.opTaskPk == 0 &&
             this.partTaskPk > 0 &&
@@ -308,7 +305,6 @@ export default {
           this.entity.multipleEquip = this.entity.multiple ? "是" : "否";
           Api.apsschedulupdateparameter(this.entity)
             .then(res => {
-              alert(5)
               if (res.result.state) {
                 this.$Message.success(res.result.msg);
                 this.$emit("on-parameter-ok");

pages/aps/aps/index.vue

@@ -146,8 +146,8 @@ export default {
           category: "icon"
         },
         {
-          key: "part_task_pk",
-          title: this.l("part_task_pk"),
+          key: "mes_code",
+          title: this.l("mes_code"),
           align: "left",
           high: true
         },