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

components/page/treeGrid/EditGrid.vue

@@ -85,8 +85,8 @@
             <div v-if="column.type=='user'">
               <User :value="item[column.key]"/>
             </div>
-            <div v-if="column.type=='users'&&item[column.key]">
-              <User v-for="li in JSON.parse(item[column.key])" :value="li" :key="li" class="ml10"/>
+            <div v-if="column.type=='users'&&item[column.key]&&item[column.key].length>0">
+              <User v-for="li in item[column.key]" :value="li" :key="li" class="ml10"/>
             </div>
             <state
               v-if="column.code"

pages/project/plan/add.vue

@@ -137,7 +137,7 @@ export default {
         endDate: null,
         type: 0,
         attachment: "",
-        executor: "",
+        executor: [],
       },
       parmsName: "app=material&eid=1&name=ProjectPlan",
       rules: {

pages/project/plan/edit.vue

@@ -139,7 +139,6 @@ export default {
     load(v) {
       Api.get({ id: v }).then((r) => {
         this.entity = r.result;
-        this.entity.executor=JSON.parse(this.entity.executor);
       });
     },
     handleSubmit() {

pages/project/plan/index.vue

@@ -268,10 +268,7 @@ export default {
       console.warn(row)
       var data=JSON.parse(JSON.stringify(row));
       data.status=1;
-      Api.sendtask({
-        id:row.id,
-        
-      }).then(r=>{
+      Api.sendtask(data).then(r=>{
         if(r.result){
           this.$Message.info("任务派发成功！");
           this.search();

pages/technology/setProcess/index.vue

@@ -9,15 +9,27 @@
           <Icon type="ios-arrow-forward" size="24" />
         </a>
       </div>
-      <Content :class="!showMenu?'con_bord':''">
-        <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch">
+      <Content :class="!showMenu ? 'con_bord' : ''">
+        <DataGrid
+          :columns="columns"
+          ref="grid"
+          :action="action"
+          :conditions="easySearch"
+        >
           <template slot="easySearch">
             <Form ref="formInline" :model="easySearch" inline>
-              <FormItem prop="productingpreparationpeople" style="width:200px">
-                <departmentSelect v-model="easySearch.productingpreparationpeople.value" :type="3"></departmentSelect>
+              <FormItem prop="productingpreparationpeople" style="width: 220px">
+                <departmentSelect
+                  v-model="easySearch.productingpreparationpeople.value"
+                  :type="3"
+                ></departmentSelect>
               </FormItem>
-              <FormItem prop="keys">
-                <Input placeholder="请输入订单编号/产品名称" v-model="easySearch.keys.value" clearable />
+              <FormItem prop="keys" style="width: 220px">
+                <Input
+                  placeholder="请输入订单编号/产品名称/图号"
+                  v-model="easySearch.keys.value"
+                  clearable
+                />
               </FormItem>
               <FormItem>
                 <Button type="primary" @click="search">查询</Button>
@@ -67,7 +79,7 @@ export default {
       detail: null,
       modal: false,
       easySearch: {
-        keys: { op: "mescode,productName", value: null },
+        keys: { op: "mescode,productName,drawnNumber", value: null },
         productingpreparationpeople: { op: "Equal", value: null },
       },
       columns: [
@@ -243,7 +255,7 @@ export default {
   font-family: Microsoft YaHei;
   padding-top: 3px;
   .ivu-layout-sider {
-    background:  @layout-content-bg-color;
+    background: @layout-content-bg-color;
     margin-right: 10px;
     box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
     height: 89vh;
@@ -251,7 +263,7 @@ export default {
   }
   .ivu-layout-content {
     // margin-left: 5px;
-    background:@right-bg;
+    background: @right-bg;
     box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
     overflow: auto;
     padding: 10px;