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

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/index.vue

@@ -4,7 +4,14 @@
       <Sider width="300" v-if="showMenu">
         <div class="p-list">
           <h3>
-            <Dictionary code="material.code.type" v-model="type" style="width:130px;float:left;"></Dictionary>
+            <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>
@@ -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;
@@ -224,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/masterData/api.js

@@ -5,6 +5,9 @@ export default {
     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);
     },

pages/materiel/masterData/index.vue

@@ -4,7 +4,10 @@
       <Sider width="300" v-if="showMenu">
         <div class="p-list">
           <h3>
-            <Dictionary code="material.code.type" v-model="type" style="width:130px;float:left;"></Dictionary>
+            <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 ddi" size="small">
                 <!-- <Button icon="md-add" title="新增顶级" @click="addNew"></Button> -->
@@ -52,6 +55,7 @@ export default {
     return {
       type: "",
       keys: "",
+      cityList:[],
       expand: false,
       list: [],
       nodeInfo: {
@@ -72,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;
@@ -136,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(
@@ -228,9 +244,7 @@ export default {
         background: rgba(245, 246, 250, 1);
         opacity: 1;
         padding-left: 10px;
-        .ddi {
-          margin-top: 3px;
-        }
+      
       }
       .search {
         height: 50px;

pages/produce/execute/components/orderlist.vue

@@ -51,6 +51,10 @@ export default {
     statu: {
       type: Number,
       default: -9
+    },
+    refresh: {
+      type: Boolean,
+      default: true
     }
   },
   created() {
@@ -80,7 +84,7 @@ export default {
           orderId: item.orderId,
           executeId: item.executeId,
           headid: item.routingHeaderId,
-          routid: item.routingDetailId,//工序ID
+          routid: item.routingDetailId, //工序ID
           quantity: item.quantity, //派工数量
           dispatchStatus: item.status
         }
@@ -96,7 +100,11 @@ export default {
       this.loadTree();
     },
     statu(v) {
-      this.statu=v
+      this.statu = v;
+      this.loadTree();
+    },
+    refresh(v) {
+      this.refresh=v;
       this.loadTree();
     }
   }

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/index.vue

@@ -31,12 +31,13 @@
             @on-change="searchOrder"
           ></Dictionary>
         </div>
-        <div class="select_t">
-          <Button @click="changeAsc">{{ascTitle}}</Button>
+        <div class="select_t" style="height:40px">
+        <Button @click="changeFresh" class="fl" shape="circle" icon="md-refresh">刷新</Button>
+          <Button @click="changeAsc" class="fr" shape="circle" icon="md-calendar">{{ascTitle}}</Button>
         </div>
       </div>
       <!-- 列表卡片主内容  -->
-      <orderlist ref="orderlistref" :asc="asc" :statu="statu" :order="inputId" />
+      <orderlist ref="orderlistref" :asc="asc" :statu="statu" :refresh="refresh" :order="inputId" />
     </Drawer>
     <!-- 功能区  -->
     <Drawer
@@ -72,7 +73,8 @@ export default {
       inputId: null,
       asc: true,
       ascTitle: "时间正序排序",
-      statu:-9
+      statu:-9,
+      refresh:true,
     };
   },
   created() {
@@ -140,6 +142,7 @@ export default {
         // this.detail = () => import("./testdata/index");
       } //测试数据
     },
+    //按时间排序按钮
     changeAsc() {
       this.asc = !this.asc;
       if (this.asc) {
@@ -147,6 +150,11 @@ export default {
       } else {
         this.ascTitle = "时间倒序排序";
       }
+    },
+    //刷新orderlist列表
+    changeFresh()
+    {
+      this.refresh=!this.refresh 
     }
   },
   watch: {