工时分配

pages/produce/execute/ProcessCase/detail.vue

@@ -4,7 +4,7 @@
       <Filed :span="24" :name="l('title')">{{entity.title}}</Filed>
       <Filed :span="24" :name="l('creationTime')">{{entity.creationTime}}</Filed>
       <Filed :span="24" :name="l('creator')">{{entity.creator}}</Filed>
-      <Filed :span="12" :name="l('filePaths')">
+      <Filed :span="24" :name="l('filePaths')">
         <files
           ref="refFile"
           :parms="parms"
@@ -46,8 +46,6 @@ export default {
   },
   methods: {
     clickData(data,liUrl) {
-        console.log(liUrl)
-        console.log(data)
       window.open(data, "_blank");
     },
     load(v) {

pages/produce/execute/api.js

@@ -33,6 +33,9 @@ export default {
    confirmproductsandoperator(params) {
     return Api.post(`${PlanUrl}/orderexecutehandon/confirmproductsandoperator`, params);
   },
-   
+  //工时分配--下一步人员
+  getentryusers(params) {
+    return Api.get(`${PlanUrl}/orderexecutenew/entryusers`, params);
+  },
   
 }
\ No newline at end of file

pages/produce/execute/execute.less

@@ -297,7 +297,8 @@
             float: left;
             margin: 20px 72px;
             width: 300px;
-            height: 240px;
+            // height: 240px;
+            height: 180px;
             border-color: #2680EB;
             .ivu-card-head{
                 background: #d3e6fb;
@@ -316,6 +317,7 @@
             .gs_time{
                 text-align: center;
                 color: #2680EB;
+                line-height: 46px;
                 .b_size{
                     font-size: 32px;
                 }
@@ -350,7 +352,8 @@
             border: 1px dashed #2680EB;
             color: #2680EB;
             text-align: center;
-            line-height: 275px;
+            // line-height: 275px;
+            line-height: 220px;
             border-radius: 4px;
             i{
                 font-size: 80px;
@@ -371,13 +374,14 @@
             height: 56px;
             border-radius: 28px 4px 4px 28px;
             border: 1px solid #2d8cf0;
-            margin: 15px 23px;
+            margin: 15px 14px;
             i {
                 font-size: 56px;
                 float: left;
                 color: #2680EB;
             }
             .gd_user {
+                line-height: 22px;
                 padding: 6px;
                 color: #707070;
             }

pages/produce/execute/taskTime/add.vue

@@ -3,7 +3,7 @@
     <div class="add_user">
         <Form ref="form" :model="entity" :rules="rules" :label-width="100">
             <Row>
-                <Col span="8">
+                <!-- <Col span="8">
                 <FormItem label="所属车间">
                     <Select v-model="entity.che" style="width:200px">
                         <Option v-for="item in cityList" :value="item.value" :key="item.value">
@@ -23,8 +23,9 @@
                 <FormItem label="">
                     <Input search enter-button placeholder="请输入编号" />
                 </FormItem>
-                </Col>
+                </Col> -->
                 <Col span="24" class="mb20">
+                    <FormItem label="既定人员" >
                         <div class="gd_userB">
                             <a class="user_item" @click="checkItem(index)"  v-for="(item,index) in listMan" :key="index">
                                 <div :class="{user_bg:item.checked}" >
@@ -36,12 +37,23 @@
                                 </div>
                             </a>
                         </div>
+                    </FormItem>
+                </Col>
+                <Col span="24">
+                    <FormItem label="添加人员" style="width:90%" >
+                        <UserSelect
+                            ref="userSelected"
+                            v-model="entity.userse"
+                            :multiple="true"
+                        />
+                            <!-- :roleTitle="roleTitle" -->
+                    </FormItem>
                 </Col>
                 <Col span="24">
-                    <FormItem label="分配工时">
-                         <InputNumber :max="30" :min="0" v-model="value1"></InputNumber> 天 &nbsp;&nbsp;&nbsp;&nbsp;
-                         <InputNumber :max="23" :min="0" v-model="value1"></InputNumber> 小时  &nbsp;&nbsp;&nbsp;&nbsp;
-                         <InputNumber :max="59" :min="1" v-model="value1"></InputNumber> 分钟  &nbsp;&nbsp;&nbsp;&nbsp;
+                    <FormItem label="分配工时" prop="setTime">
+                         <!-- <InputNumber :max="30" :min="0" v-model="value1"></InputNumber> 天 &nbsp;&nbsp;&nbsp;&nbsp; -->
+                         <InputNumber :max="100" :min="1" v-model="value1"></InputNumber> 工时  &nbsp;&nbsp;&nbsp;&nbsp;
+                         <!-- <InputNumber :max="59" :min="1" v-model="value1"></InputNumber> 分钟  &nbsp;&nbsp;&nbsp;&nbsp; -->
                     </FormItem>
                 </Col>
             </Row>
@@ -58,9 +70,7 @@
 export default {
     data(){
         return{
-            admor:1,
             value1:1,
-            u_bgFlag:false,
             entity: {
             },
             rules: {
@@ -68,6 +78,7 @@ export default {
                     { required: true, message: "必填", type: "number", trigger: "change" }
                 ]
             },
+            // roleTitle: "操作工",
             cityList:[
                 {
                     value: '车间A1',
@@ -102,6 +113,36 @@ export default {
                     userName:'张珊珊3',
                     userCode:'08965483',
                     id: 3
+                },{
+                    checked:false,
+                    userName:'张珊珊3',
+                    userCode:'08965483',
+                    id: 3
+                },{
+                    checked:false,
+                    userName:'张珊珊3',
+                    userCode:'08965483',
+                    id: 3
+                },{
+                    checked:false,
+                    userName:'张珊珊3',
+                    userCode:'08965483',
+                    id: 3
+                },{
+                    checked:false,
+                    userName:'张珊珊3',
+                    userCode:'08965483',
+                    id: 3
+                },{
+                    checked:false,
+                    userName:'张珊珊3',
+                    userCode:'08965483',
+                    id: 3
+                },{
+                    checked:false,
+                    userName:'张珊珊3',
+                    userCode:'08965483',
+                    id: 3
                 }
             ],
         }
@@ -116,6 +157,23 @@ export default {
         checkItem(i){
             this.listMan[i].checked = !this.listMan[i].checked;
         },
+        testChange () { // 该方法在input内容改变是就会触发进行检测
+		    this.numberChange(this.myNumber ) // 调用函数
+	    },
+	
+	    // 封装控制小数点位数的函数
+        numberChange (VauleNumber) { // VauleNumber你想要控制位数的数字
+        let newNumber= null
+        if (VauleNumber >= 0) {
+            let reg = /.*\..*/
+            if (reg.test(VauleNumber)) {
+            newNumber= parseFloat(VauleNumber.toFixed(1))
+            } else {
+            newNumber= VauleNumber
+            }
+        }
+        return newNumber
+        }
     },
 }
 </script>
\ No newline at end of file

pages/produce/execute/taskTime/index.vue

@@ -21,7 +21,7 @@
             </div>
         </div>
         <div class="gs_card_box">
-            <Card class="gs_card" v-for="i of 1" :key="i">
+            <Card class="gs_card" v-for="i of 8" :key="i">
                 <p slot="title" class="gs_title">
                     张三
                     <span class="fr">02816335{{i}}</span>
@@ -29,14 +29,14 @@
                 <!-- <p class="gs_p">所属车间：车间A{{i}}</p>
                 <p class="gs_p">所属班组：班组B{{i}}</p> -->
                 <p class="gs_time">
-                    <span class="b_size">100</span>  时
+                    <span class="b_size">100</span>  工时
                 </p>
-                <p class="gs_p">
+                <!-- <p class="gs_p">
                     <span class="b_size">100</span>  分
                 </p>
                 <p class="gs_p">
                     <span class="b_size">100</span>  秒
-                </p>
+                </p> -->
                 <p class="gs_footer">
                     <!-- <a class="gs_edit" @click="editItem">
                         <Icon type="md-create" />
@@ -60,6 +60,7 @@
 </template>
 <script>
 import addview from "./add";
+import Api from "../api";
 export default {
     name:'starOrder',
     components: {addview,},
@@ -88,6 +89,9 @@ export default {
     methods: {
         addItem(){
             this.addmodal = true
+            let id = this.$route.query.id
+            console.log(id)
+            // Api.getentryusers().then()
         },
         editItem(){
             this.$Message.success("编辑工时...")