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

i18n/locale/zh-CN.js

@@ -1488,9 +1488,9 @@ export default {
     type:'类型',
     status:'状态',
     description:'描述',
-    levelNum:'编码分类层数',
-    codeLength:'编码分类位数',
-    materialCodeLength:'物料编码位数'
+    levelNum:'分类层数',
+    codeLength:'分类位数',
+    materialCodeLength:'流水位数'
     },
     //转续列表
     order_execute_handon:{

pages/materiel/codeRule/add.vue

@@ -21,11 +21,7 @@
           <Dictionary code="material.code.status" v-model="entity.status"></Dictionary>
         </FormItem>
       </Col>
-      <Col :span="24">
-        <FormItem :label="l('description')" prop="description">
-          <Input v-model="entity.description" type="textarea" :rows="2"></Input>
-        </FormItem>
-      </Col>
+     
       <Col :span="12">
         <FormItem :label="l('levelNum')" prop="levelNum">
           <InputNumber v-model="entity.levelNum" :max="10" :min="1"></InputNumber>
@@ -41,6 +37,11 @@
           <InputNumber v-model="entity.materialCodeLength" :max="10" :min="1"></InputNumber>
         </FormItem>
       </Col>
+       <Col :span="24">
+        <FormItem :label="l('description')" prop="description">
+          <Input v-model="entity.description" type="textarea" :rows="2"></Input>
+        </FormItem>
+      </Col>
     </Row>
     <FormItem>
       <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
@@ -66,7 +67,7 @@ export default {
         code: "",
         name: "",
         type: null,
-        status: null,
+        status: 0,
         description: "",
         levelNum: null,
         codeLength: null,

pages/materiel/codeRule/detail.vue

@@ -11,10 +11,11 @@
 <Filed :span="12" :name="l('status')">
     <state code="material.code.status" :value="entity.status" type="text"></state>
 </Filed> -->
-<Filed :span="24" :name="l('description')">{{entity.description}}</Filed>
+
 <Filed :span="12" :name="l('levelNum')">{{entity.levelNum}}</Filed>
 <Filed :span="12" :name="l('codeLength')">{{entity.codeLength}}</Filed>
 <Filed :span="12" :name="l('materialCodeLength')">{{entity.materialCodeLength}}</Filed>
+<Filed :span="24" :name="l('description')">{{entity.description}}</Filed>
         </Row>
        
     </div>

pages/materiel/codeRule/edit.vue

@@ -21,11 +21,7 @@
           <Dictionary code="material.code.status" v-model="entity.status"></Dictionary>
         </FormItem>
       </Col>
-      <Col :span="24">
-        <FormItem :label="l('description')" prop="description">
-          <Input v-model="entity.description" type="textarea" :rows="2"></Input>
-        </FormItem>
-      </Col>
+     
       <Col :span="12">
         <FormItem :label="l('levelNum')" prop="levelNum">
           <InputNumber v-model="entity.levelNum" disabled :max="10" :min="1"></InputNumber>
@@ -41,6 +37,11 @@
           <InputNumber v-model="entity.materialCodeLength" disabled :max="10" :min="1"></InputNumber>
         </FormItem>
       </Col>
+       <Col :span="24">
+        <FormItem :label="l('description')" prop="description">
+          <Input v-model="entity.description" type="textarea" :rows="2"></Input>
+        </FormItem>
+      </Col>
     </Row>
     <FormItem>
       <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>

pages/produce/execute/judgment/index.vue

@@ -677,13 +677,14 @@ export default {
         .batchOrderStart(parmese)
         .then(response => {
           if (response.success) {
-            this.loadchangelist();
+            // this.loadFun();
             this.$Message.info("送审成功!");
-            this.dataListRetrunNew.idList = [];
+            // this.dataListRetrunNew.idList = [];
+            this.ModalOrder = false;
           } else {
             this.$Message.error("送审失败!");
+            this.ModalOrder = false;
           }
-          this.modalInfo = false;
         });
     },
     // 取消 返回工单列表

pages/produce/execute/taskTime/add.vue

@@ -65,8 +65,8 @@
         </Col>
         <Col span="24">
           <FormItem label="分配工时" prop="setTime">
-            <!-- <InputNumber :max="30" :min="0" v-model="value1"></InputNumber> 天 &nbsp;&nbsp;&nbsp;&nbsp; -->
-            <InputNumber :max="maxHour" :min="1" v-model="entity.workHour" @on-change="testChange"></InputNumber>&nbsp;&nbsp;&nbsp;&nbsp;工时 
+            <!-- <InputNumber :max="30" :min="0" :step="1" v-model="value1"></InputNumber> 天 &nbsp;&nbsp;&nbsp;&nbsp; -->
+            <InputNumber :max="maxHour" :min="1" :editable="false" v-model="entity.workHour" @on-change="testChange"></InputNumber>&nbsp;&nbsp;&nbsp;&nbsp;工时 
             <!-- <InputNumber :max="59" :min="1" v-model="value1"></InputNumber> 分钟  &nbsp;&nbsp;&nbsp;&nbsp; -->
           </FormItem>
         </Col>
@@ -121,10 +121,9 @@ export default {
           this.entity.cardNo = item.cardNo
         }
       })
-      console.log(this.entity);
+      // console.log(this.entity);
       this.$emit("on-ok", this.entity);
       this.showSelect = true
-      // this.entity={}
     },
     //单选框
     radioChange(val) {
@@ -172,25 +171,13 @@ export default {
       }
     },
     // 选择新增人员
-    changeUser(data){
-        // console.log(data)
-        let alloterInfo = this.$refs.userSelected.getSelectItems();
-        if(data&&data!=undefined){
-            this.userflag = true
-        }
-        if(data==undefined){
-            this.userflag = false
-        }
-        // if (!userInfo || userInfo.length == 0) {
-        //   this.$Message.error("请选择人员！");
-        //   return;
-        // }
-        // console.log(alloterInfo)
-        if(alloterInfo.length>0){
-          this.entity.cardNo = alloterInfo[0].cardNo
-          this.entity.userName = alloterInfo[0].userName
-          this.entity.userId = alloterInfo[0].id
-        }
+    changeUser(data){       
+        this.$nextTick(()=>{
+          let alloterInfo = this.$refs.userSelected.getSelectItems();
+            this.entity.cardNo = alloterInfo[0].cardNo
+            this.entity.userName = alloterInfo[0].userName
+            this.entity.userId = alloterInfo[0].id
+        })
     },
     testChange() {
       // 该方法在input内容改变是就会触发进行检测

pages/produce/execute/taskTime/index.vue

@@ -143,6 +143,12 @@ export default {
         });
         this.$refs.addview.listMan = result;
       });
+      this.$refs.addview.entity = {
+        cardNo: "",
+        oldUserse: null,
+        userse: null,
+        workHour: 1,
+      }
     },
     editItem() {
       this.$Message.success("编辑工时...");

pages/test/u.vue

@@ -20,7 +20,10 @@
     <Button @click="getFileInfo">得到多文件上传信息</Button>
 
     <h2>人员选择</h2>
-    <UserSelect v-model="user" :multiple="true" />
+    <UserSelect v-model="user"  />
+    <p>
+      {{user}}
+    </p>
     <h2>时间展示</h2>
     <DTSpan type="date" v-model="testDate"></DTSpan>
     <h2>时间段展示</h2><!-- 默认为datetime类型，可设置为date型，type="date";默认展示快捷时间段，包括当天、本周、本月，如不需要:showFast="false" -->