质量判定送审

pages/produce/execute/components/orderlist.vue

 
 <template>
     <div class="order_list">
-        <!-- <div slot="header">
-            <span class="gd_tt">工单列表</span>
-            <a ><Icon type="ios-list" size="18" />  展开全部列表</a>
-        </div> -->
-        <!-- <div class="select_t">
-            <!-- <Icon type="md-arrow-dropright" /> 
-            <Select v-model="odermodel" style="width:100px" @on-change="searchOrder">
-                <Option v-for="item in oderList" :value="item.value" :key="item.index">{{ item.label }}</Option>
-            </Select>
-            <Button class="fr">时间正序排列</Button>
-        </div> -->
         <div class="card_box">
             <Card class="card_order" v-for="(item,index) in listTasks"
                 @click.native="goPage(item)" :key="index"
@@ -45,50 +34,23 @@ export default {
     data(){
         return{
             gnFlag:0,
-            odermodel:'全部',
-            oderList:[
-                {
-                    value: '全部',
-                    label: '全部'
-                },{
-                    value: '未开工',
-                    label: '未开工'
-                },{
-                    value: '执行中',
-                    label: '执行中'
-                },{
-                    value: '暂停中',
-                    label: '暂停中'
-                },{
-                    value: '交检中',
-                    label: '交检中'
-                },{
-                    value: '交接中',
-                    label: '交接中'
-                },{
-                    value: '已完成',
-                    label: '已完成'
-                },
-            ],
             listTasks:[],
             dataLength:0,
         }        
     },
     created() {
-        this.loadTree();
+        this.loadTree(-9);
     },
     methods: {
-        loadTree(){
+        loadTree(value){
             let parmse = {
-                    status: 0,
+                    status: value,
                     isAsc: true
                 }
             Api.getCardList(parmse).then(res=>{
                 if(res.success){
                     this.listTasks = res.result
                     this.dataLength = res.result.length
-                    // let len = res.result.length;
-                    // this.$emit('getListLength',len)
                 }
             })
         },
@@ -97,21 +59,7 @@ export default {
         },
         goPage(item){
             console.log(item)
-        },
-        searchOrder(value){
-            let allList = this.listTask;
-            let newitems = [];
-            if(value=="全部"){
-                this.loadTree();
-            }else{
-                allList.map((u,i)=>{
-                    // console.log(i,":",u)
-                    if(u.status==value){
-                        newitems.push(u)
-                    }
-                })
-                this.listTasks = newitems
-            }
+            this.$Message.success("工单查询数据...")
         },
     },
     watch:{

pages/produce/execute/index.vue

@@ -90,6 +90,7 @@ export default {
                 //     label: '交接中'
                 // },{
             ],
+            condition:[]
         }
     },
     created() {
@@ -107,26 +108,13 @@ export default {
         starFun(){
             this.$Message.success("开工...")
         },
-        // getListLength(len){
-        //     this.listLength = len
-        // },
+        // getListLength(len){ this.listLength = len },
         // 返回工单列表
         goToOrder(){
             this.$router.push("/produce/orderlist");
         },
         searchOrder(value){
-            let allList = this.$refs.orderlist.listTasks;
-            let newitems = [];
-            if(value=="-9"){
-                this.$refs.orderlist.loadTree();
-            }else{
-                allList.map((u,i)=>{
-                    if(u.status==value){
-                        newitems.push(u)
-                    }
-                })
-                this.$refs.orderlist.listTasks = newitems
-            }
+            this.$refs.orderlist.loadTree(value);
         },
         changeTitle(number,type){
             this.orderTitle = type
@@ -144,11 +132,7 @@ export default {
         },
     },
     watch:{ 
-        listLength(val,newV){
-            console.log("111",val)
-            console.log("020202",newV)
-            // this.listLength = 
-        }
+
     },
 }
 </script>

pages/produce/execute/judgment/index.vue

@@ -46,14 +46,33 @@
                 </div>
             </div>
             <div class="fei_right" v-if="feilist.length>0">
-                <p>问题原因：<Select style="width:80%">
+                <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.number" :key="item.index">{{ item.number }}</Option>
+                    </Select>
+                </FormItem>
+                <FormItem label="责任归属：" prop="useroption" style="width:100%">
+                    <Select v-model="orderForm.useroption" style="width:80%">
+                        <Option value="" class="option-text">请选择</Option><!--  :disabled="feilist.length == 0 ?  true:false" placeholder="选择问题原因" -->
+                        <Option v-for="item in blameList" :value="item.user" :key="item.index">{{ item.user }}</Option>
+                    </Select>
+                </FormItem>
+                <!-- <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>
                         </Select></p>
                 <p>责任归属：<Select style="width:80%">
-                            <Option value="" class="option-text">请选择</Option> <!-- placeholder="选择责任人" -->
+                            <Option value="" class="option-text">请选择</Option> 
                             <Option v-for="item in blameList" :value="item.user" :key="item.index">{{ item.user }}</Option>
-                        </Select></p>
+                        </Select></p> -->
+                </Form>
             </div>
         </div>
         <div class="futer flex fc-ev" v-if="ranglist.length>0||fanlist.length>0||feilist.length>0" >
@@ -85,6 +104,26 @@ export default {
         return{
             checkedflag:false,
             ModalOrder:false,
+            rules:{
+                question: [
+                    {
+                        required: true,
+                        message: "请选择问题原因",
+                        trigger: "change"
+                    }
+                ],
+                useroption: [
+                    {
+                        required: true,
+                        message: "请选择责任人",
+                        trigger: "change"
+                    }
+                ],
+            },
+            orderForm:{
+                question:'',
+                useroption:''
+            },
             cardlist:[
                 {
                     status:0,
@@ -317,8 +356,12 @@ export default {
         },
         // 送审
         sendOrder(){
-            this.$Message.success("送审...")
+            this.$refs['formValidate'].validate((valid) => {
+                if(valid){
+                    // this.$Message.success("送审...")
                     this.ModalOrder = true
+                }
+            })
         },
         orderSendOk(){
             ahis.$Message.success("送审中...")