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

pages/materiel/masterData/add.vue

@@ -50,8 +50,10 @@ export default {
     return {
       arr: [],
       entity: {
-        upId: 0,
-        code: 0
+        code: 0,
+        categoryId: 0, //左侧树点击的id
+        customProperties: {},
+        rootCategoryId: 0 //左侧树点击的数据的最顶层id
       },
       disabled: false,
 

pages/materiel/masterData/api.js

@@ -7,16 +7,16 @@ export default {
         return Api.post(`${systemUrl}/category/list`,params);
     },
     get(params){
-    return Api.get(`${systemUrl}/category/get`,params);
+    return Api.get(`${systemUrl}/material/get`,params);
     },
     create(params){
-    return Api.post(`${systemUrl}/category/create`,params);
+    return Api.post(`${systemUrl}/material/create`,params);
     },
     update(params){
-    return Api.post(`${systemUrl}/category/update`,params);
+    return Api.post(`${systemUrl}/material/update`,params);
     },
     delete(id) {
-    return Api.delete(`${systemUrl}/category/delete`,{params:{id:id}});
+    return Api.delete(`${systemUrl}/material/delete`,{params:{id:id}});
     },
    
     }
\ No newline at end of file

pages/materiel/masterData/masterData.vue

@@ -50,6 +50,7 @@ export default {
       title: "新增",
       curId: 0,
       detail: null,
+      nodeInfo: {},
       easySearch: {
         keys: { op: "unicode,name,code", value: null }
       },
@@ -133,10 +134,10 @@ export default {
     add() {
       this.curId = 0;
       this.title = "新增";
-      this.detail = () => import("./Add");
+      this.detail = () => import("./add");
       this.modal = true;
     },
-
+    edit(row) {},
     remove(id) {
       this.$Modal.confirm({
         title: "删除",

pages/produce/execute/execute.less

@@ -743,8 +743,7 @@
 }
 .zhuanx{
     text-align: center;
-    line-height: 50px;
-    .line_p{
-
+    line-height: 60px;
+    .line_p input{
     }
 }
\ No newline at end of file

pages/produce/execute/starOrder/index.vue

@@ -78,7 +78,7 @@
         <ViewerImg :images="images" />
       </div>
     </div>
-    <Modal v-model="ransferModal" :title="transferTitle" fullscreen style="z-index:99999" :footer-hide="cardlist.length>0">
+    <Modal v-model="ransferModal" :title="transferTitle" fullscreen style="z-index:99999"  :footer-hide="cardlist.length==0">
       <div class="wu_bgModal">
         <div class="mass_box">
           <div class="mass_list">
@@ -107,7 +107,7 @@
           <UserSelect ref="userSelected" :datas="userlist" v-model="user" v-width="300" />
         </div>
       </div>
-      <div slot="footer" >
+      <div slot="footer">
         <Button class="button" @click="ransferModal=false">取消</Button>
         <Button class="button" type="primary" @click="ransOk">确定</Button>
       </div>
@@ -163,7 +163,7 @@ export default {
     // this.treeHeight = window.innerHeight - 120;
   },
   async fetch({ store, params }) {
-    await store.dispatch("loadDictionary"); // 加载数据字典
+    await store.dispatch("loadDictionary"); 
   },
   mounted() {
     this.load(this.id);

pages/produce/reorder/index.vue

 
+ <style lang="less">
+  @import "../execute/execute.less";
+  </style>
 <template>
-    <div class="p20">
-        <div class="">
-            转序交接
-        </div> 
-             
-    </div>
+  <div>
+    <DataGrid
+      :action="action"
+      :columns="columns"
+      :conditions="easySearch"
+      ref="grid"
+      @on-selection-change="onSelect"
+      :batch="true"
+      :border="false"
+      :high="false"
+    >
+      <template slot="easySearch">
+        <Form ref="formInline" :model="easySearch" inline>
+          <FormItem prop="keys">
+            <Input
+              search
+              enter-button
+              placeholder="请输入关键字订单编号/项目名称"
+              v-model="easySearch.keys.value"
+              @on-search="search"
+              v-width="300"
+            />
+          </FormItem>
+        </Form>
+      </template>
+      <template slot="batch">
+        <Button type="primary" class="mr10 ml10" @click="openTrans">确认转续</Button>
+      </template>
+    </DataGrid>
+    <Modal v-model="transModal" title="确认转续" width="900">
+      <div class="zhuanx mt30">
+        <p class="line_p">
+          <Input prefix="ios-contact-outline" placeholder="请输入人员编号" style="width: auto" />
+        </p>
+        <p class="line_p">
+          <Input prefix="ios-lock-outline" placeholder="请输入人员密码" style="width: auto" />
+        </p>
+      </div>
+      <div slot="footer">
+        <Button @click="transModal = false">取消</Button>
+        <Button type="primary" @click="transOk">确定转续</Button>
+      </div>
+    </Modal>
+  </div>
 </template>
 <script>
+import Api from "../api";
 export default {
-    name:'starOrder',
-    data(){
-        return{
-            starmodal: false,
+  name: "reOrder",
+  data() {
+    return {
+      action: Api.index,
+      starmodal: false,
+      easySearch: {
+        keys: {
+          op: "mesCode,productName",
+          value: null,
+          default: true
         }
+      },
+      transModal: false,
+      arrayIds: [],
+      rowDataArry: [],
+      columns: [
+        {
+          key: "selection",
+          type: "selection",
+          width: 50,
+          align: "center"
+        },
+        {
+          key: "quantity",
+          title: this.l("quantity"),
+          align: "right",
+          high: true,
+          width: 80
+        },
+        {
+          key: "taskRequire",
+          title: this.l("taskRequire"),
+          align: "left",
+          easy: true,
+          high: true,
+          hide: true
+        },
+        {
+          key: "status",
+          title: this.l("status"),
+          align: "center",
+          high: true,
+          code: "plan.order.status",
+          width: 100
+        },
+        {
+          key: "productCode",
+          title: this.l("productCode"),
+          align: "left",
+          easy: true,
+          high: true,
+          hide: true
+        },
+        {
+          key: "productName",
+          title: this.l("productName"),
+          align: "left",
+          easy: true,
+          high: true
+        },
+        {
+          key: "drawnNumber",
+          title: this.l("drawnNumber"),
+          align: "left",
+          easy: true,
+          high: true
+        },
+        {
+          key: "batchNumber",
+          title: this.l("batchNumber"),
+          align: "left",
+          easy: true,
+          high: true
+        },
+        {
+          key: "projectNumber",
+          title: this.l("projectNumber"),
+          align: "left",
+          easy: true,
+          high: true
+        },
+        {
+          key: "urgencyLevel",
+          title: this.l("urgencyLevel"),
+          align: "center",
+          high: true,
+          code: "plan.order.urgencyLevel",
+          width: 100
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 180,
+          align: "center",
+          render: (h, params) => {
+            return h("div", { class: "action" }, [
+              h(
+                "op",
+                {
+                  attrs: { oprate: "edit" },
+                  on: { click: () => this.openTrans(params.row) },
+                  style: params.row.status == 1 ? "display:none" : ""
+                },
+                "确认转续"
+              )
+            ]);
+          }
+        }
+      ]
+    };
+  },
+  created() {
+    // this.treeHeight = window.innerHeight - 120;
+  },
+  async fetch({ store, params }) {
+    await store.dispatch("loadDictionary"); // 加载数据字典
+  },
+  mounted() {
+    window.onresize = () => {
+      ///浏览器窗口大小变化
+      return (() => {
+        this.treeHeight = window.innerHeight - 120;
+      })();
+    };
+  },
+  methods: {
+    search() {
+      this.easySearch.keys.value = this.easySearch.keys.value.trim();
+      this.$refs.grid.reload(this.easySearch);
     },
-    created() {
-        // this.treeHeight = window.innerHeight - 120;
-    },
-    async fetch({ store, params }) {
-        await store.dispatch("loadDictionary"); // 加载数据字典
+    openTrans() {
+      this.transModal = true;
     },
-    mounted() {
-        window.onresize = () => {
-        ///浏览器窗口大小变化
-        return (() => {
-            this.treeHeight = window.innerHeight - 120;
-        })();
-        };
+    transOk() {
+      alert("确定转续");
     },
-    methods: {
-        starFun(){
-            this.$Message.success("开工...")
-        },
+    onSelect(a, b) {
+      //alert(JSON.stringify(a));
+      //批量选择
+      let selectRows = a;
+      this.arrayIds = [];
+      this.rowDataArry = a;
+      selectRows.forEach(e => {
+        this.arrayIds.push(e.id);
+      });
     },
-}
+    l(key) {
+      let vkey = "mes_plan" + "." + key;
+      return this.$t(vkey) || key;
+    }
+  }
+};
 </script>

src/assets/css/execute.css

@@ -306,7 +306,7 @@
   height: 59px;
   line-height: 60px;
   text-align: center;
-  width: calc(50% - 2px);
+  width: calc(100% - 0px);
 }
 .gs_set .gs_card_box .gs_card .gs_footer .gs_del {
   background: #2680EB;
@@ -700,5 +700,5 @@
 }
 .zhuanx {
   text-align: center;
-  line-height: 50px;
+  line-height: 60px;
 }