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

pages/materiel/classification/add.vue

@@ -55,6 +55,8 @@
               ></state>
               <Dictionary
                 v-else
+                @on-change="setRow(row,index)"
+                v-model="row.dataType"
                 code="materail.category.dataType"
                 type="select"
                 :value="row.dataType"
@@ -100,7 +102,8 @@ export default {
       arr: [],
       entity: {
         upId: 0,
-        code: 0
+        code: 0,
+        status:0,
       },
       disabled: false,
       columns: [

pages/materiel/classification/api.js

@@ -4,6 +4,10 @@ export default {
     paged(params){
         return Api.post(`${systemUrl}/category/paged`,params);
     },
+    // indexSlecet:`${systemUrl}/coderule/paged`,
+    pagedSlecet(params){
+    return Api.post(`${systemUrl}/coderule/paged`,params);
+    },
     listTable(params){
         return Api.post(`${systemUrl}/custompropertydefinition/list`,params);
     },

pages/materiel/classification/edit.vue

@@ -51,6 +51,8 @@
               ></state>
               <Dictionary
                 v-else
+                @on-change="setRow(row,index)"
+                v-model="row.dataType"
                 code="materail.category.dataType"
                 type="select"
                 :value="row.dataType"

pages/materiel/classification/index.vue

@@ -4,7 +4,14 @@
       <Sider width="300" v-if="showMenu">
         <div class="p-list">
           <h3>
-            零部件库
+            <Select
+              v-model="model8"
+              clearable
+              style="width:130px;float:left;margin-top:8px"
+              @on-change="chnangeClick"
+            >
+              <Option v-for="item in cityList" :value="item.id" :key="item.id">{{ item.name }}</Option>
+            </Select>
             <div class="fr mr10 mt10">
               <ButtonGroup class="fr" size="small">
                 <Button icon="md-add" title="新增顶级" @click="addNew"></Button>
@@ -53,7 +60,7 @@
         </a>
       </div>
       <Content :class="!showMenu?'con_bord':''">
-        <MasterData ref="dataTable" @on-edit="editRow" :root="root"  @on-ok="ok"/>
+        <MasterData ref="dataTable" @on-edit="editRow" :root="root" @on-ok="ok" />
       </Content>
     </Layout>
     <Modal v-model="modal" :title="title" width="1000" footer-hide :mask-closable="false">
@@ -83,6 +90,7 @@ export default {
         id: 0,
         ids: []
       },
+      cityList: [],
       keys: "",
       expand: false,
       list: [],
@@ -100,8 +108,20 @@ export default {
   },
   created() {
     this.loadTree();
+    this.listSlecet();
   },
   methods: {
+    listSlecet() {
+      let data = {
+        conditions: []
+      };
+      Api.pagedSlecet(data).then(r => {
+        this.cityList = r.result.items;
+      });
+    },
+    chnangeClick(val) {
+      this.loadTree(val);
+    },
     showMenuFn() {
       //this.$Message.info("展开左侧树")
       this.showMenu = true;
@@ -192,10 +212,9 @@ export default {
         },
         data.title +
           "(" +
-          (
-            data.totalMaterialCount == undefined
-              ? "0"
-              : data.totalMaterialCount) +
+          (data.totalMaterialCount == undefined
+            ? "0"
+            : data.totalMaterialCount) +
           ")"
       );
     },
@@ -225,7 +244,7 @@ export default {
       //   this.$refs.dataTable.dataColumns = tableData;
       // }
     },
-    loadTree() {
+    loadTree(id) {
       let conditions = [];
       Api.list({ conditions: conditions }).then(r => {
         var data = this.$u.toTree(

pages/materiel/classification/sonAdd.vue

@@ -50,7 +50,8 @@ export default {
     return {
       entity: {
         upId: this.nodeInfo.id,
-        code: 0
+        code: 0,
+        status: 0
       },
       upName: this.nodeInfo.title,
       disabled: false,

pages/materiel/masterData/add.vue

@@ -52,6 +52,7 @@ export default {
       arr: [],
       entity: {
         code: 0,
+        status: 0,
         categoryId: this.nodeInfo.categoryId, //左侧树点击的id
         customProperties: {},
         rootCategoryId: this.nodeInfo.rootCategoryId //左侧树点击的数据的最顶层id

pages/materiel/masterData/api.js

 import Api from '@/plugins/request'
 export default {
     index:`${systemUrl}/material/paged`,
-     lists:`${systemUrl}/category/list`,
+     lists:`${systemUrl}/actionlog/list`,
     paged(params){
         return Api.post(`${systemUrl}/material/paged`,params);
     },
+    pagedSlecet(params){
+        return Api.post(`${systemUrl}/coderule/paged`,params);
+        },
     list(params){
         return Api.post(`${systemUrl}/category/list`,params);
     },
@@ -21,6 +24,6 @@ export default {
     return Api.delete(`${systemUrl}/material/delete`,{params:{id:id}});
     },
     categoryList(params){
-        return Api.post(`${systemUrl}/category/list`,params);
+        return Api.post(`${systemUrl}/actionlog/list`,params);
     },
     }
\ No newline at end of file

pages/materiel/masterData/details.vue

@@ -52,8 +52,8 @@
           </div>
         </div>
         <div v-show="showTable">
-          <!-- <DataGrid :columns="columns" ref="grid" :action="action" :high="false" :height="750"></DataGrid> -->
-          <Table border :columns="columns" :data="data1" :height="800"></Table>
+          <DataGrid :columns="columns" ref="grid" :action="action" :tool="false" :height="750"></DataGrid>
+          <!-- <Table border :columns="columns" :data="data1" :height="800"></Table> -->
         </div>
       </Content>
     </Layout>
@@ -124,25 +124,26 @@ export default {
       } else {
         this.showFrom = false;
         this.showTable = true;
-        this.easySearch = {
-          conditions: [
-            {
-              fieldName: "table",
-              fieldValue: "material",
-              conditionalType: "Equal"
-            },
-            {
-              fieldName: "tId",
-              fieldValue: this.rowId,
-              conditionalType: "Equal"
-            }
-          ]
-        };
-        Api.categoryList(this.easySearch).then(r => {
-          if (r.result) {
-            this.data1 = r.result;
-          }
-        });
+        this.$refs.grid.reload(this.easySearch);
+        // this.easySearch = {
+        //   conditions: [
+        //     {
+        //       fieldName: "table",
+        //       fieldValue: "material",
+        //       conditionalType: "Equal"
+        //     },
+        //     {
+        //       fieldName: "tId",
+        //       fieldValue: this.rowId,
+        //       conditionalType: "Equal"
+        //     }
+        //   ]
+        // };
+        // Api.categoryList(this.easySearch).then(r => {
+        //   if (r.result) {
+        //     this.data1 = r.result;
+        //   }
+        // });
       }
     },
     l(key) {

pages/materiel/masterData/index.vue

@@ -4,9 +4,12 @@
       <Sider width="300" v-if="showMenu">
         <div class="p-list">
           <h3>
-            零部件库
+            <Select v-model="model8" clearable style="width:130px;float:left;margin-top:8px" @on-change='chnangeClick'>
+              <Option v-for="item in cityList" :value="item.id" :key="item.id">{{ item.name }}</Option>
+            </Select>
+            </Select>
             <div class="fr mr10 mt10">
-              <ButtonGroup class="fr" size="small">
+              <ButtonGroup class="fr ddi" size="small">
                 <!-- <Button icon="md-add" title="新增顶级" @click="addNew"></Button> -->
                 <Button
                   :icon="expand ? 'md-arrow-dropright' : 'md-arrow-dropdown'"
@@ -50,7 +53,9 @@ export default {
   name: "masterData",
   data() {
     return {
+      type: "",
       keys: "",
+      cityList:[],
       expand: false,
       list: [],
       nodeInfo: {
@@ -71,8 +76,20 @@ export default {
   },
   created() {
     this.loadTree();
+     this.listSlecet();
   },
   methods: {
+     listSlecet() {
+      let data = {
+        conditions: []
+      };
+      Api.pagedSlecet(data).then(r => {
+        this.cityList = r.result.items;
+      });
+    },
+    chnangeClick(val){
+      this.loadTree(val);  
+    },
     showMenuFn() {
       //this.$Message.info("展开左侧树")
       this.showMenu = true;
@@ -135,7 +152,7 @@ export default {
         this.nodeInfo.rootCategoryId = pid;
       }
     },
-    loadTree() {
+    loadTree(id) {
       let conditions = [];
       Api.list({ conditions: conditions }).then(r => {
         var data = this.$u.toTree(
@@ -208,7 +225,7 @@ export default {
     background: rgba(255, 255, 255, 1);
     margin-right: 10px;
     box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
-    height: 87vh;
+    height: 88vh;
 
     h4 {
       height: 30px;
@@ -227,6 +244,7 @@ export default {
         background: rgba(245, 246, 250, 1);
         opacity: 1;
         padding-left: 10px;
+      
       }
       .search {
         height: 50px;
@@ -274,7 +292,7 @@ export default {
     box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
     overflow: auto;
     padding: 10px;
-    height: 87vh;
+    height: 88vh;
     overflow-y: hidden;
   }
 }

pages/materiel/masterData/masterData.vue

@@ -203,7 +203,7 @@ export default {
       // });
     },
     details(id) {
-      alert(id)
+    
       this.$router.push({
         path: "/materiel/masterData/details",
         query: {

pages/produce/execute/api.js

@@ -9,6 +9,10 @@ export default {
   submitData(params) {
     return Api.post(`${PlanUrl}/orderexecutequalityrecord/checkdispatchproduct`, params);
   },
+  // 质量判定获取不合格品送审编号
+  getshenliNo(params) {
+    return Api.post(`${PlanUrl}/orderexecutebadproduct/create`, params);
+  },
   //工单联合信息
   orderanddispatchinfos(params) {
     return Api.get(`${PlanUrl}/orderexecutenew/orderanddispatchinfos`, params);

pages/produce/execute/datafilling/index.vue

 
 <template>
   <div class="data-filling">
-    <div class="data-title">
-      <span class="ml20">产品号</span>
-      <ProductNumberSelect
-        v-model="product_ID"
-        :eid="row.orderId"
-        ref="codes"
-        @on-change="change"
-        class="select-produt-name"
-      />
+    <div class="data-title flex">
+      <div class="fg">
+        <span class="ml20">产品号</span>
+        <ProductNumberSelect
+          v-model="product_ID"
+          :eid="row.orderId"
+          ref="codes"
+          @on-change="change"
+          :multiple="false"
+          class="select-produt-name"
+        />
+      </div>
+
       <!-- <template v-if="datasearch.isMain!=1">
         <span class="ml20">汇报板次</span>
         <Select @on-change="boardonchange" v-model="board_ID" class="w200">
@@ -20,7 +24,8 @@
           >{{ item.boardNumber }}</Option>
         </Select>
       </template>-->
-      <Button type="primary" @click="QcCardChecker(1)" class="title_btn ml10">自检</Button>
+      <div class="tr">
+         <Button type="primary" @click="QcCardChecker(1)" class="title_btn ml10">自检</Button>
       <Button type="primary" :disabled="ishavhj" @click="QcCardChecker(2)" class="title_btn ml10">互检</Button>
       <Button type="primary" :disabled="ishavzj" @click="SendCheck()" class="title_btn ml10">送检</Button>
       <Button
@@ -29,6 +34,8 @@
         @click="SendCheckRecord()"
         class="title_btn ml10"
       >送检记录</Button>
+      </div>
+     
     </div>
     <div class="table-i">
       <Table border :columns="columns12" :data="recorddata">
@@ -413,7 +420,7 @@ export default {
       });
     },
     change(v) {
-      this.datasearch.productcode = v.join(",");
+      this.datasearch.productcode = v;
       this.loaddata();
     },
     showrecordData(params, fill_in_user_type, isedit) {

pages/produce/execute/judgment/index.vue

@@ -86,7 +86,7 @@
         <div class="list02">
           <Tag
             type="dot" class="tag_card02"
-            v-for="(item,index) in feilist" :key="index"
+            v-for="(item,index) in feilist" :key="item.id"
             :name="item.id" :checkable="false"
             closable @on-close="feiClose"
           >{{item.prefix}}.{{ item.code}}</Tag>
@@ -114,9 +114,9 @@
         </Form>
       </div>
     </div>
-    <div class="futer flex fc-ev" v-if="ranglist.length>0||fanlist.length>0||feilist.length>0">
+    <div class="futer flex fc-ev" v-if="hegelist.length>0||ranglist.length>0||fanlist.length>0||feilist.length>0">
       <Button class="button" size="large" type="primary" @click="sendOrder" v-if="feilist.length>0" >送审</Button>
-      <Button class="button" size="large" type="primary" @click="submit" v-else>提交</Button>
+      <Button class="button" size="large" type="primary" @click="submit" v-else>保存</Button>
        <!-- :disabled="hegelist.length!=0&&fanlist.length!=0&&ranglist.length!=0" -->
       <Button class="button" size="large" @click="toOrder">取消</Button>
     </div>
@@ -174,15 +174,16 @@ export default {
       ranglist: [],
       fanlist: [],
       feilist: [],
+      titleCode: '',//送审单号
       problemList: [
-        { problem: "问题描述01" },
-        { problem: "问题描述02" },
-        { problem: "问题描述03" }
+        { problem: "问题描述01",id:1 },
+        { problem: "问题描述02",id:2 },
+        { problem: "问题描述03",id:3 }
       ],
       blameList: [
-        { user: "责任人01" },
-        { user: "责任人02" },
-        { user: "责任人03" }
+        { user: "责任人01",id:1 },
+        { user: "责任人02",id:2 },
+        { user: "责任人03",id:3 }
       ]
     };
   },
@@ -219,7 +220,8 @@ export default {
           }
           if(u.productStatus==4){
             this.fanlist.push(u)
-          }if(u.productStatus==0){
+          }
+          if(u.productStatus==0){
             this.cardlist.push(u)
           }
           });
@@ -331,19 +333,19 @@ export default {
     okModal() {
       let unmb = this.num;
       if (unmb == 1) {
-        this.cansolhege();
+        this.cansolRang();
         this.suModal = false;
       }
       if (unmb == 2) {
-        this.cansolfei();
+        this.cansolfan();
         this.suModal = false;
       }
       if (unmb == 3) {
-        this.cansolRang();
+        this.cansolfei();
         this.suModal = false;
       }
-      if (unmb == 4) {
-        this.cansolfan();
+      if (unmb == 0) {
+        this.cansolhege();
         this.suModal = false;
       }
     },
@@ -544,6 +546,7 @@ export default {
                 }
             }
         }
+          // console.log(lists)
         let parmes={
             dispatchId: this.$route.query.id,
             orderId: this.$route.query.orderId,
@@ -551,50 +554,77 @@ export default {
         };
       Api.submitData(parmes).then(res=>{
         if(res.success){
-          this.$Message.success("提交成功!");
+          this.$Message.success("保存成功!");
         }else{
-          this.$Message.success("提交失败~");
+          this.$Message.success("保存失败~");
         }
       })
     },
     // 打开送审
     sendOrder() {
       let orderse = []
+      let orderIds = []
       this.feilist.map(item=>{
         orderse.push(item.prefix+'.'+item.code)
+        orderIds.push(item.id)
       })
-      let strOder = orderse.join(",")// console.log(strOder)
+      let strOder = orderse.join(",")
       this.entity.cause =  this.orderForm.question;
       this.entity.reporter = this.orderForm.useroption; 
-      this.entity.strOder = strOder; // console.log(this.entity)
+      this.entity.strOder = strOder; 
+      this.entity.orderIds = orderIds; 
       this.$refs["formValidate"].validate(valid => {
         if (valid) {
           this.submit()//提交状态改变
-          let parmeseData = this.entity// console.log(parmeseData) this.$Message.success("送审")
+          let parme = {
+                reason: this.entity.cause,
+                personLiableId: this.entity.reporter,
+                dispatchId: this.$route.query.id,
+                orderId: this.$route.query.orderId,
+                productIds: this.entity.orderIds,
+              }
+          Api.getshenliNo(parme).then(res=>{
+            if(res.success){
+              // this.$refs.orderSendReview.info.orderInfo.code = res.result.code
+              this.entity.code = res.result.code
+              this.entity.idlist = res.result.id
+            }else{
+              console.log("获取编号失败")
+            }
+          })
+          let parmeseData = this.entity//  this.$Message.success("送审")
+            console.info(parmeseData)
           this.ModalOrder = true;
           this.$refs.orderSendReview.alertFun(parmeseData);
+          
         }
       });
     },
     // 确定送审
     orderSendOk() {
-      ahis.$Message.success("送审中...");
-      // let operatorIdList = this.$refs.orderSendReview.returnDataList();
-      // let itemCode = this.formdata.unqualified_order_code;
-      // this.dataListRetrunNew.code = itemCode;
-      // this.dataListRetrunNew.operatorIdList = operatorIdList;
-      // this.$http.order
-      //   .batchOrderStart(this.dataListRetrunNew)
-      //   .then(response => {
-      //     if (response.success) {
-      //       this.loadchangelist();
-      //       this.$Message.info("送审成功!");
-      //       this.dataListRetrunNew.idList = [];
-      //     } else {
-      //       this.$Message.error("送审失败!");
-      //     }
-      //     this.modalInfo = false;
-      //   });
+      // console.log("old->",this.entity)
+      let orderids = []
+      orderids.push(this.entity.idlist)
+      console.log("new->",this.entity)
+      let parmese ={
+        schemaId: "c2e09c9b-02a9-4188-97a6-cdb68d50a64a",
+        idList: orderids,
+        code: this.entity.code,
+        operatorIdList: this.$refs.orderSendReview.returnDataList(),
+      } 
+      
+      this.$http.order
+        .batchOrderStart(parmese)
+        .then(response => {
+          if (response.success) {
+            this.loadchangelist();
+            this.$Message.info("送审成功!");
+            this.dataListRetrunNew.idList = [];
+          } else {
+            this.$Message.error("送审失败!");
+          }
+          this.modalInfo = false;
+        });
     },
     // 取消 返回工单列表
     toOrder() {

pages/produce/execute/judgment/orderInfos.vue

@@ -3,15 +3,18 @@
     <Row>
       <Filed :span="12" :name="l('productName')">{{info.orderInfo.productName}}</Filed>
       <Filed :span="12" :name="l('drawnNumber')">{{info.orderInfo.drawnNumber}}</Filed>
-      <Filed :span="12" :name="l('status')">{{info.orderInfo.status}}</Filed>
+      <Filed :span="12" :name="l('status')">
+        <state code="plan.order.status" ref="state" :value="info.orderInfo.status" type="text" ></state>
+      </Filed>
       <Filed :span="12" :name="l('mesCode')">{{info.orderInfo.mesCode}}</Filed>
       <Filed :span="12" name="批次号">{{info.orderInfo.batchNumber}}</Filed>
-      <!-- <Filed :span="8" :name="l('batchNumber')">{{info.orderInfo.batchNumber}}</Filed> -->
+      <!-- <Filed :span="12" name="派工数量">{{info.orderInfo.dispatchQuantity}}</Filed> -->
       <Filed :span="12" :name="l('quantity')">{{info.orderInfo.quantity}}</Filed>
       <Filed :span="12" name="节点日期">{{info.orderInfo.demandFinishDate}}</Filed>
+      <Filed :span="12" name="工序名称">{{info.orderInfo.seqName}}</Filed>
       <Filed :span="12" name="问题原因">{{info.orderInfo.cause}}</Filed>
       <Filed :span="12" name="责任归属">{{info.orderInfo.reporter}}</Filed>
-      <Filed :span="12" name="不合格产品号">{{info.orderInfo.demandFinishDate}}</Filed>
+      <!-- <Filed :span="12" name="送审编号">{{info.orderInfo.code}}</Filed> -->
       <Filed :span="24" name="不合格产品">{{info.orderInfo.strOder}}</Filed>
       <!-- <Filed :span="8" :name="l('stage')">
         <state code="plan.order.stage" :value="info.orderInfo.stage+''" type="text"></state>
@@ -46,6 +49,12 @@ export default {
       key = 'order_list' + '.' + key
       return this.$t(key)
     }
+  },
+  watch:{
+    info(n,o){
+        console.log(n)
+        console.log(o)
+    }
   }
 }
 </script>
\ No newline at end of file

pages/produce/execute/judgment/orderSendReview.vue

@@ -15,6 +15,7 @@
 </template>
 
 <script>
+// import Api from "../api";
 import OrderInfos from './orderInfos'
 import Process from '@/components/orderOperator/process'
 export default {
@@ -80,7 +81,7 @@ export default {
     }
   },
   created() {
-    var theight = window.innerHeight - 630 + 'px'
+    var theight = window.innerHeight - 650 + 'px'
     this.divHeight = theight
   },
   mounted() {
@@ -88,7 +89,7 @@ export default {
       ///浏览器窗口大小变化
       return (() => {
         window.screenHeight = window.innerHeight
-        this.divHeight = window.screenHeight - 630 + 'px'
+        this.divHeight = window.screenHeight - 650 + 'px'
       })()
     }
   },
@@ -96,7 +97,23 @@ export default {
     alertFun(parmeseData){
       console.warn(parmeseData)
       this.info.orderInfo = parmeseData
-      alert("加载数据")
+      // let parme = {
+      //           reason: parmeseData.cause,
+      //           personLiableId: parmeseData.reporter,
+      //           dispatchId: this.$route.query.id,
+      //           orderId: this.$route.query.orderId,
+      //           productIds: parmeseData.orderIds,
+      //         }
+      //     Api.getshenliNo(parme).then(res=>{
+      //       if(res.success){
+      //         this.info.orderInfo.push(code = res.resoult.code)
+              // parmeseData.code = res.resoult.code
+              // this.$refs.orderSendReview.info.orderInfo.code = res.resoult.code
+              // this.entity.code = res.resoult.code
+          //   }else{
+          //     console.log("获取编号失败")
+          //   }
+          // })
     },
     intData(data) {
       console.warn(data)

pages/produce/execute/taskTime/add.vue

@@ -173,7 +173,7 @@ export default {
     },
     // 选择新增人员
     changeUser(data){
-        console.log(data)
+        // console.log(data)
         let alloterInfo = this.$refs.userSelected.getSelectItems();
         if(data&&data!=undefined){
             this.userflag = true
@@ -185,7 +185,7 @@ export default {
         //   this.$Message.error("请选择人员！");
         //   return;
         // }
-        console.log(alloterInfo)
+        // console.log(alloterInfo)
         if(alloterInfo.length>0){
           this.entity.cardNo = alloterInfo[0].cardNo
           this.entity.userName = alloterInfo[0].userName