质量判定o

pages/produce/execute/judgment/index.vue

@@ -20,27 +20,32 @@
                 <Button class="button03" @click="chansefei">废品</Button>
             </div>
             <div class="mass_list rangbu" v-if="ranglist.length>0">
-                <h2 class="rangb">让步（{{ranglist.length}}）</h2>
+                <h2 class="rangb">让步（{{ranglist.length}}）
+                    <Button class="fr" @click="cansolRang">取消让步</Button>
+                </h2>
 
                 <div class="list02">
                     <Tag type="dot" class="tag_card02" v-for="(item,index) in ranglist" :key="index" :name="item.id" :checkable="false" closable @on-close="handleClose">{{ item.code}}</Tag>
                 </div>
             </div>
             <div class="mass_list fanxiu_box" v-if="fanlist.length>0">
-                <h2 class="fanxiu">返修（{{fanlist.length}}）</h2>
+                <h2 class="fanxiu">返修（{{fanlist.length}}）
+                    <Button class="fr" @click="cansolfan">取消返修</Button>
+                </h2>
                 <div class="list02">
                     <Tag type="dot" class="tag_card02" v-for="(item,index) in fanlist" :key="index" :name="item.id" :checkable="false" closable @on-close="fanClose">{{ item.code}}</Tag>
                 </div>
             </div>
 
             <div class="mass_list fei_box" v-if="feilist.length>0">
-                <h2 class="feipin">废品（{{feilist.length}}）</h2>
+                <h2 class="feipin">废品（{{feilist.length}}）
+                    <Button class="fr" @click="cansolfei">取消废品</Button>
+                </h2>
                 <div class="list02">
                     <Tag type="dot" class="tag_card02" v-for="(item,index) in feilist" :key="index" :name="item.id" :checkable="false" closable @on-close="feiClose">{{ item.code}}</Tag>
                 </div>
             </div>
             <div class="fei_right" v-if="feilist.length>0">
-                
                 <p>问题原因：<Select style="width:80%">
                             <Option value="" class="option-text">请选择</Option><!--  :disabled="feilist.length == 0 ?  true:false" placeholder="选择问题原因" -->
                             <Option v-for="item in problemList" :value="item.number" :key="item.index">{{ item.number }}</Option>
@@ -83,82 +88,82 @@ export default {
             cardlist:[
                 {
                     status:0,
-                    code:1001210101,
+                    code:100111111,
                     id:1,
                     checked:false,
                 },{
                     status:1,
-                    code:1001210102,
+                    code:100111222,
                     id:2,
                     checked:false,
                 },{
                     status:2,
-                    code:1001210103,
+                    code:100111333,
                     id:3,
                     checked:false,
                 },{
                     status:3,
-                    code:1001210104,
+                    code:100111444,
                     id:4,
                     checked:false,
                 },{
                     status:0,
-                    code:1001210105,
+                    code:100111555,
                     id:5,
                     checked:false,
                 },{
                     status:1,
-                    code:1001210106,
+                    code:100111666,
                     id:6,
                     checked:false,
                 },{
                     status:2,
-                    code:1001210107,
+                    code:100111777,
                     id:7,
                     checked:false,
                 },{
                     status:3,
-                    code:1001210108,
+                    code:100111888,
                     id:8,
                     checked:false,
                 },{
                     status:0,
-                    code:1001210109,
+                    code:100111999,
                     id:9,
                     checked:false,
                 },{
                     status:1,
-                    code:1001210110,
+                    code:101112000,
                     id:10,
                     checked:false,
                 },{
                     status:2,
-                    code:1001210111,
+                    code:101112111,
                     id:11,
                     checked:false,
                 },{
                     status:3,
-                    code:1001210112,
+                    code:101112222,
                     id:12,
                     checked:false,
                 },{
                     status:0,
-                    code:1001210113,
+                    code:101112333,
                     id:13,
                     checked:false,
                 },{
                     status:1,
-                    code:1001210114,
+                    code:101112444,
                     id:14,
                     checked:false,
                 },{
                     status:2,
-                    code:1001210115,
+                    code:101112555,
                     id:15,
                     checked:false,
                 },{
                     status:3,
-                    code:1001210116,
+                    code:101112666,
                     id:16,
                     checked:false,
                 },
@@ -254,33 +259,57 @@ export default {
         },
         handleClose(event,name){
             let rangold = this.ranglist
-            let index = this.ranglist.indexOf(name);
-            let ide = this.cardlist.includes(name);
+            let index = this.ranglist.findIndex(item => {
+                return item.id === name;
+            });
             let itemlist = rangold.filter(item => {
-                if(item.id == name){ return item }
+                if(item.id === name){ return item }
             })
             this.ranglist.splice(index, 1);
-            this.cardlist.splice(ide, 0, itemlist[0]); 
+            this.cardlist.splice( 0,0, itemlist[0]); 
+        },
+        cansolRang(){
+            let rangblist = this.ranglist
+            rangblist.map(v =>{
+                this.cardlist.unshift(v); 
+            })
+            this.ranglist = []
         },
         fanClose(event,name){
             let fanold = this.fanlist
-            let index = this.fanlist.indexOf(name);
-            let ide = this.cardlist.includes(name);
-            let itemlist = fanold.filter(item => {
-                if(item.id == name){ return item }
+            let inde = this.fanlist.findIndex(item => {
+                return item.id === name;
+            });
+            let utemlist = fanold.filter(utem => {
+                if(utem.id == name){ return utem }
+            })
+            this.fanlist.splice(inde, 1);
+            this.cardlist.splice(0, 0, utemlist[0]); 
+        },
+        cansolfan(){
+            let fanglist = this.fanlist
+            fanglist.map(v =>{
+                this.cardlist.unshift(v); 
             })
-            this.fanlist.splice(index, 1);
-            this.cardlist.splice(ide, 0, itemlist[0]); 
+            this.fanlist = []
         },
         feiClose(event,name){
             let feiold = this.feilist
-            let index = this.feilist.indexOf(name);
-            let ide = this.cardlist.includes(name);
-            let itemlist = feiold.filter(item => {
-                if(item.id == name){ return item }
+            let indexed = this.feilist.findIndex(item => {
+                return item.id === name;
+            });
+            let rtemlist = feiold.filter(rtem => {
+                if(rtem.id == name){ return rtem }
+            })
+            this.feilist.splice(indexed, 1);
+            this.cardlist.splice(0, 0, rtemlist[0]); 
+        },
+        cansolfei(){
+            let feipinlist = this.feilist
+            feipinlist.map(v =>{
+                this.cardlist.unshift(v); 
             })
-            this.feilist.splice(index, 1);
-            this.cardlist.splice(ide, 0, itemlist[0]); 
+            this.feilist = []
         },
         // 提交
         submit(){
@@ -290,19 +319,6 @@ export default {
         sendOrder(){
             this.$Message.success("送审...")
             this.ModalOrder = true
-            //打开订单审批modal层
-            // let selectList = this.$refs.table.selectLists()
-            let arrStatu = [0, 1] //状态为0[驳回]或1[新建] 才能进行订单的送审
-            // if (selectList.length > 0) {
-            //     if (this.checkArrStatu(selectList, arrStatu)) {
-            //     this.ModalOrderSendReview = true
-            //     this.$refs.orderSendReview.intData(this.$refs.table.selectLists())
-            //     } else {
-            //     this.$Message.error('选择订单中有不允许进行送审的订单！')
-            //     }
-            // } else {
-            //     this.$Message.error('请选择送审的订单！')
-            // }
         },
         orderSendOk(){
             ahis.$Message.success("送审中...")