techenology

components/page/departmentSelect.vue

@@ -56,7 +56,8 @@ export default {
            item=items[0];
           }
           this.$emit("on-change",v,item)
-      }
+      },
+     
   },
   watch: {
     value: {

i18n/locale/zh-CN.js

@@ -1171,9 +1171,11 @@ export default {
     name: '工艺名称',
     code: '工艺编号',
     productId: '产品id',
+    productName:'产品名称',
     version: '版本',
     author: '编制人',
     departmentId: '主制车间',
+    departmentName:'主制车间',
     isMain: '主工艺',
     upId: '父工艺',
     upDetailId: '上级工序',
@@ -1191,6 +1193,10 @@ export default {
     phase: '阶段',
     versionid: '版本ID',
     isSendPpm: '发送PPM',
+    creationTime:'创建时间',
+    creatorUserId:'创建人',
+    lastModificationTime:'最近修改时间',
+    lastModifierUserId:'最近修改人',
   },
   routing_detail:{
     id:'',

pages/technology/add.vue

@@ -31,7 +31,7 @@
       </Col>
       <Col :span="8">
         <FormItem :label="l('productId')" prop="productId">
-          <ProductSelect v-model="entity.productId"></ProductSelect>
+          <ProductSelect v-model="entity.productId" @on-change="proChange"></ProductSelect>
         </FormItem>
       </Col>
 
@@ -40,27 +40,22 @@
           <Input v-model="entity.version"></Input>
         </FormItem>
       </Col>
-      <Col :span="8">
-        <FormItem :label="l('author')" prop="author">
-          <UserSelect v-model="entity.author"></UserSelect>
-        </FormItem>
-      </Col>
       <Col :span="8">
         <FormItem :label="l('departmentId')" prop="departmentId">
-          <departmentSelect v-model="entity.departmentId"></departmentSelect>
+          <departmentSelect v-model="entity.departmentId"  @on-change="departChange"></departmentSelect>
         </FormItem>
       </Col>
-      <Col :span="5">
+      <Col :span="8">
         <FormItem :label="l('isMain')" prop="isMain">
           <Dictionary code="Process.state" v-model="entity.isMain" type="radio"></Dictionary>
         </FormItem>
       </Col>
-      <Col :span="6">
+      <Col :span="8">
         <FormItem :label="l('isSendPpm')" prop="isSendPpm">
           <Dictionary code="Process.Status" v-model="entity.isSendPpm" type="radio"></Dictionary>
         </FormItem>
       </Col>
-      <Col :span="5">
+      <Col :span="8">
         <FormItem :label="l('isEffect')" prop="isEffect">
           <Dictionary code="Process.Status" v-model="entity.isEffect" type="radio"></Dictionary>
         </FormItem>
@@ -123,7 +118,13 @@
         <FormItem :label="l('versionid')" prop="versionid">
           <InputNumber v-model="entity.versionid"></InputNumber>
         </FormItem>
-      </Col>-->
+      </Col>
+      <Col :span="8">
+        <FormItem :label="l('author')" prop="author">
+          <UserSelect v-model="entity.author"></UserSelect>
+        </FormItem>
+      </Col>
+      -->
       <Col :span="24">
         <FormItem :label="l('remark')" prop="remark">
           <i-quill v-model="entity.remark" :height="300" border v-paste="handleImg" />
@@ -304,6 +305,14 @@ export default {
     l(key) {
       key = "routingHeader" + "." + key;
       return this.$t(key);
+    },
+    proChange(v,items)
+    {
+      alert(v+"__"+JSON.stringify(items))
+    },
+    departChange(v,items)
+    {
+      alert(v+"__"+JSON.stringify(items))
     }
   },
   watch: {

pages/technology/index.vue

@@ -153,7 +153,7 @@ export default {
           high: true
         },
         { key: "version", title: this.l("version"), align: "left", high: true },
-        { key: "author", title: this.l("author"), align: "left", high: true },
+        { key: "creatorUserId", title: this.l("author"), align: "left", high: true,type:"user" },
         {
           key: "departmentId",
           title: this.l("departmentId"),
@@ -161,14 +161,7 @@ export default {
           align: "left",
           high: true
         },
-        {
-          key: "isMain",
-          title: this.l("isMain"),
-          align: "center",
-          width: 80,
-          high: true,
-          code: "Process.state"
-        },
+        
         // { key:"upId",title:this.l("upId")   ,align:"left"    ,high:true  },
         // { key:"upDetailId",title:this.l("upDetailId")  ,hide:true ,align:"left"    ,high:true  },
         {
@@ -191,6 +184,7 @@ export default {
           align: "center",
           width: 80,
           high: true,
+           hide: true,
           code: "Process.Status"
         },
         {
@@ -205,6 +199,7 @@ export default {
           title: this.l("phase"),
           align: "left",
           high: true,
+           hide: true,
           code: "Process.Routing.phase"
         },
         {
@@ -214,6 +209,14 @@ export default {
           hide: true,
           code: "Process.Routing.version"
         },
+        {
+          key: "isMain",
+          title: this.l("isMain"),
+          align: "center",
+          width: 80,
+          high: true,
+          code: "Process.state"
+        },
         {
           key: "isSendPpm",
           title: this.l("isSendPpm"),