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

pages/produce/execute/judgment/index.vue

@@ -64,17 +64,10 @@
         <div class="fei_right" v-if="feilist.length>0">
             <Form :model="orderForm" :label-width="110" :rules="rules" ref="formValidate">
                 <FormItem label="问题原因：" prop="question" style="width:100%">
-                    <Select v-model="orderForm.question" style="width:80%">
-                        <Option value class="option-text">请选择</Option>
-                        <!--  :disabled="feilist.length == 0 ?  true:false" placeholder="选择问题原因" -->
-                        <Option v-for="item in problemList" :value="item.problem" :key="item.index">{{ item.problem }}</Option>
-                    </Select>
+                    <dictionary style="width:240px" code="orderList.UnqualifiedReasons" v-model="orderForm.question"></dictionary>
                 </FormItem>
                 <FormItem label="责任归属：" prop="useroption" style="width:100%">
-                    <Select v-model="orderForm.useroption" style="width:80%">
-                        <Option value class="option-text">请选择</Option>
-                        <Option v-for="item in blameList" :value="item.user" :key="item.index">{{ item.user }}</Option>
-                    </Select>
+                    <UserSelect ref="userSelected" v-model="orderForm.useroption" />
                 </FormItem>
             </Form>
         </div>
@@ -121,12 +114,14 @@ export default {
                 question: [{
                     required: true,
                     message: "请选择问题原因",
-                    trigger: "change"
+                    trigger: "change",
+                    type: 'number'
                 }],
                 useroption: [{
                     required: true,
                     message: "请选择责任人",
-                    trigger: "change"
+                    trigger: "change",
+                    type: 'number'
                 }]
             },
             orderForm: {
@@ -300,18 +295,14 @@ export default {
         },
         // 让步关闭
         handleClose(event, name) {
-            let rangold = this.ranglist;
-            let index = this.ranglist.findIndex(item => {
+            let rangold = this.$u.clone(this.ranglist);
+            let ind = this.ranglist.findIndex(item => {
                 return item.id === name;
             });
-            let itemlist = rangold.filter(item => {
-                if (item.id === name) {
-                    item.productStatus = 0
-                    return item;
-                }
-            });
-            this.ranglist.splice(index, 1);
-            this.cardlist.splice(0, 0, itemlist[0]);
+            rangold[ind].productStatus = 0
+            rangold[ind].checked = false
+            this.cardlist.push(rangold[ind]);
+            this.ranglist.splice(ind, 1);
         },
         consoleFun(u) {
             this.suModal = true;
@@ -345,18 +336,14 @@ export default {
             this.hegelist = [];
         },
         hegeClose(event, name) {
-            let hegeold = this.hegelist;
+            let hegeold = this.$u.clone(this.hegelist);
             let ind = this.hegelist.findIndex(hgitem => {
                 return hgitem.id === name;
             });
-            let hgtemlist = hegeold.filter(hgtem => {
-                if (hgtem.id == name) {
-                    hgtem.productStatus = 0
-                    return hgtem;
-                }
-            });
+            hegeold[ind].productStatus = 0
+            hegeold[ind].checked = false
+            this.cardlist.push(hegeold[ind]);
             this.hegelist.splice(ind, 1);
-            this.cardlist.splice(0, 0, hgtemlist[0]);
         },
         cansolRang() {
             let rangblist = this.ranglist;
@@ -367,18 +354,15 @@ export default {
             this.ranglist = [];
         },
         fanClose(event, name) {
-            let fanold = this.fanlist;
-            let inde = this.fanlist.findIndex(item => {
+            let fanold = this.$u.clone(this.fanlist);
+            let ind = this.fanlist.findIndex(item => {
                 return item.id === name;
             });
-            let utemlist = fanold.filter(utem => {
-                if (utem.id == name) {
-                    utem.productStatus = 0
-                    return utem;
-                }
-            });
-            this.fanlist.splice(inde, 1);
-            this.cardlist.splice(0, 0, utemlist[0]);
+            fanold[ind].productStatus = 0
+            fanold[ind].checked = false
+            this.cardlist.push(fanold[ind]);
+            this.fanlist.splice(ind, 1);
+
         },
         cansolfan() {
             let fanglist = this.fanlist;
@@ -389,18 +373,15 @@ export default {
             this.fanlist = [];
         },
         feiClose(event, name) {
-            let feiold = this.feilist;
-            let indexed = this.feilist.findIndex(item => {
+            let feiold = this.$u.clone(this.feilist);
+            let ind = this.feilist.findIndex(item => {
                 return item.id === name;
             });
-            let rtemlist = feiold.filter(rtem => {
-                if (rtem.id == name) {
-                    rtem.productStatus = 0
-                    return rtem;
-                }
-            });
-            this.feilist.splice(indexed, 1);
-            this.cardlist.splice(0, 0, rtemlist[0]);
+            feiold[ind].productStatus = 0
+            feiold[ind].checked = false
+            this.cardlist.push(feiold[ind]);
+            this.feilist.splice(ind, 1);
+
         },
         cansolfei() {
             let feipinlist = this.feilist;
@@ -453,10 +434,12 @@ export default {
                 })
             }
             if (pass05) {
+
                 cardseops = {
                     prodcutIds: [],
                     productStatus: this.cardlist[0].productStatus
                 }
+
                 this.cardlist.map(ch => {
                     cardseops.prodcutIds.push(ch.id)
                 })
@@ -472,7 +455,8 @@ export default {
                     feipops.prodcutIds.push(un.id)
                 })
             }
-            if (cardseops.productStatus) {
+
+            if (cardseops.productStatus == 0) {
                 lists.push(cardseops)
             }
             if (hegeops.productStatus) {