technology

pages/technology/add.vue

@@ -46,8 +46,8 @@
         </FormItem>
       </Col>
       <Col :span="8">
-        <FormItem :label="l('version')" prop="version">
-          <Input v-model="entity.version"></Input>
+        <FormItem :label="l('version')" prop="versionid">
+           <Dictionary code="Process.Routing.version" v-model="entity.versionid"></Dictionary>
         </FormItem>
       </Col>
       <Col :span="8">

pages/technology/detailExamine.vue

@@ -5,7 +5,7 @@
       <Filed :span="6" :name="l('name')">{{info.name}}</Filed>
       <Filed :span="5" :name="l('code')">{{info.code}}</Filed>
       <Filed :span="5" :name="l('routingType')"><state code="Process.Routing.routingType" :value="info.routingType" type="text"></state></Filed>
-      <Filed :span="3" :name="l('version')">{{info.version}}</Filed>
+      <Filed :span="3" :name="l('version')"><state code="Process.Routing.version" :value="info.versionid" type="text"></state></Filed>
     </Row>
   </div>
 </template>

pages/technology/edit.vue

@@ -12,15 +12,16 @@
         </FormItem>
       </Col>-->
        <Col :span="8">
-        <FormItem :label="l('name')" prop="name">
-          <Input v-model="entity.name"></Input>
+        <FormItem :label="l('code')" prop="code">
+          <Input v-model="entity.code" disabled></Input>
         </FormItem>
       </Col>
       <Col :span="8">
-        <FormItem :label="l('code')" prop="code">
-          <Input v-model="entity.code"></Input>
+        <FormItem :label="l('name')" prop="name">
+          <Input v-model="entity.name"></Input>
         </FormItem>
       </Col>
+     
       <Col :span="8">
         <FormItem :label="l('routingType')" prop="routingType">
           <Dictionary code="Process.Routing.routingType" v-model="entity.routingType"></Dictionary>
@@ -42,8 +43,8 @@
         </FormItem>
       </Col>
       <Col :span="8">
-        <FormItem :label="l('version')" prop="version">
-          <Input v-model="entity.version"></Input>
+        <FormItem :label="l('version')" prop="versionid">
+          <Dictionary code="Process.Routing.version" v-model="entity.versionid"></Dictionary>
         </FormItem>
       </Col>
       <Col :span="8">
@@ -51,11 +52,7 @@
           <departmentSelect v-model="entity.departmentId" @on-change="departChange"></departmentSelect>
         </FormItem>
       </Col>
-      <Col :span="8">
-        <FormItem :label="l('isSendPpm')" prop="isSendPpm">
-          <Dictionary code="Process.Status" v-model="entity.isSendPpm" type="radio"></Dictionary>
-        </FormItem>
-      </Col>
+     
       <Col :span="8">
         <FormItem :label="l('isEffect')" prop="isEffect">
           <Dictionary code="Process.Status" v-model="entity.isEffect" type="radio"></Dictionary>
@@ -63,6 +60,11 @@
       </Col>
       <!-- 
          <Col :span="8">
+        <FormItem :label="l('isSendPpm')" prop="isSendPpm">
+          <Dictionary code="Process.Status" v-model="entity.isSendPpm" type="radio"></Dictionary>
+        </FormItem>
+      </Col>    
+         <Col :span="8">
         <FormItem :label="l('isMain')" prop="isMain">
           <Dictionary code="Process.state" v-model="entity.isMain" type="radio"></Dictionary>
         </FormItem>

pages/technology/index.vue

@@ -116,14 +116,20 @@
 
 <script>
 import Api from "./api";
-import service from '@/plugins/request'
+import service from "@/plugins/request";
 import Search from "./search";
 import ProductTree from "@/components/page/productTree.vue";
 import sendAudit from "./sendAudit.vue";
-import routingchangeorder from '../processDesign/Process/routingchangeorder.vue'
-import changelist from '../processDesign/Process/changelist.vue'
+import routingchangeorder from "../processDesign/Process/routingchangeorder.vue";
+import changelist from "../processDesign/Process/changelist.vue";
 export default {
-  components: { ProductTree, Search, sendAudit,routingchangeorder,changelist },
+  components: {
+    ProductTree,
+    Search,
+    sendAudit,
+    routingchangeorder,
+    changelist
+  },
   head: {
     title: "工艺规程",
     author: "henq",
@@ -147,7 +153,6 @@ export default {
       uId: "",
       documentShow: false,
       columns: [
-        
         {
           key: "code",
           title: this.l("code"),
@@ -171,7 +176,21 @@ export default {
           width: 100,
           code: "Process.Routing.phase"
         },
-        { key: "version", title: this.l("version"), align: "left", high: true,width: 100, },
+        {
+          key: "versionid",
+          title: this.l("version"),
+          align: "center",
+          high: true,
+          width: 100,
+          code:"Process.Routing.version"
+        },
+        {
+          title: this.l("approvalStatus"),
+          key: "approvalStatus",
+          align: "center",
+          width: "120",
+          code:"process.RoutingStatus"
+        },
         {
           key: "routingType",
           title: this.l("routingType"),
@@ -212,7 +231,7 @@ export default {
         // { key:"upDetailId",title:this.l("upDetailId")  ,hide:true ,align:"left"    ,high:true  },
         //{ key: "classId", title: this.l("classId"), align: "left", hide: true },
         //{ key: "unicode", title: this.l("unicode"),align: "left",easy: false,hide: true},
-        // { key:"status",title:this.l("status")   ,align:"left"    ,high:true ,code:'Process.Status' },
+
         // { key:"approvalStatus",title:this.l("approvalStatus")   ,align:"left"    ,high:true ,code:'process.RoutingStatus' },
         // { key:"approvalStatusRemark",title:this.l("approvalStatusRemark")   ,align:"left"    ,high:true  },
         // { key:"auditUserId1",title:this.l("auditUserId1")   ,align:"left"    ,high:true  },
@@ -232,7 +251,8 @@ export default {
           key: "creatorUserId",
           title: this.$t("creatorUserId"),
           align: "left",
-          hide: true
+          hide: true,
+          type: "user"
         },
         {
           key: "lastModificationTime",
@@ -244,7 +264,8 @@ export default {
           key: "lastModifierUserId",
           title: this.$t("lastModifierUserId"),
           align: "left",
-          hide: true
+          hide: true,
+          type: "user"
         },
         {
           title: "操作",
@@ -283,7 +304,7 @@ export default {
                   attrs: { oprate: "edit" },
                   on: { click: () => this.edit(params.row) }
                 },
-                "编辑"
+                params.row.approvalStatus == 4||params.row.approvalStatus == 0 ? "编辑" : ""
               ),
               h(
                 "op",
@@ -291,15 +312,15 @@ export default {
                   attrs: { oprate: "delete" },
                   on: { click: () => this.remove(params.row.id) }
                 },
-                "删除"
+                params.row.approvalStatus == 4||params.row.approvalStatus == 0 ? "删除" : ""
               ),
               h(
                 "op",
                 {
-                  attrs: { oprate: "detail" },
+                  attrs: { oprate: "detail" }
                   // on: { click: () => this.TechnologyChange(params.row) }
                 },
-                 "新增更改单"
+                 params.row.approvalStatus == 1 ? "新增更改单" : ""
               ),
               h(
                 "op",
@@ -460,48 +481,46 @@ export default {
     },
     //工艺更改
     TechnologyChange(row) {
-      this.$refs.routingchangeorder.flag = 0
-      this.$refs.routingchangeorder.routing_header_Id = row.id
-      var userId =this.$store.state.userInfo.userId
+      this.$refs.routingchangeorder.flag = 0;
+      this.$refs.routingchangeorder.routing_header_Id = row.id;
+      var userId = this.$store.state.userInfo.userId;
       let parma = {
         Id: userId
-      }
-      this.$refs.routingchangeorder.changeorder_code = ''
-      this.$http.sysUser.getuserinfo(parma).then((res) => {
+      };
+      this.$refs.routingchangeorder.changeorder_code = "";
+      this.$http.sysUser.getuserinfo(parma).then(res => {
         if (res.result) {
           this.$refs.routingchangeorder.formValidate = {
             technical_name: row.name,
             technical_code: row.code,
             department_name: res.result.departmentTitle,
             propose_user_name: res.result.userName
+          };
         }
-        }
-      })
-      var url1 = `${designUrl}/routingheader/GetCodeByType?code=JSWJGGD`
-      service.get(`${url1}`).then((response) => {
-        this.$refs.routingchangeorder.changeorder_code = response.result
-      })
-      this.$refs.routingchangeorder.modelChange = true
+      });
+      var url1 = `${designUrl}/routingheader/GetCodeByType?code=JSWJGGD`;
+      service.get(`${url1}`).then(response => {
+        this.$refs.routingchangeorder.changeorder_code = response.result;
+      });
+      this.$refs.routingchangeorder.modelChange = true;
     },
 
     Main(data) {
       // this.eid1 = ''
-      this.seleId = data.row.id
-      this.$refs.changelist.seleId = data.row.id
-      let url = `${designUrl}/routingheaderchangeorder/getpaged`
-      service
-        .get(`${url}`, { routing_header_id: this.seleId })
-        .then((res) => {
+      this.seleId = data.row.id;
+      this.$refs.changelist.seleId = data.row.id;
+      let url = `${designUrl}/routingheaderchangeorder/getpaged`;
+      service.get(`${url}`, { routing_header_id: this.seleId }).then(res => {
         //console.log(res)
-          this.$refs.changelist.data2 = res.result.items
-          this.$refs.changelist.myloading = false
+        this.$refs.changelist.data2 = res.result.items;
+        this.$refs.changelist.myloading = false;
         if (this.$refs.changelist.data2.length == 0) {
-            this.$Message.error('该工艺规程没有更改单！')
-            this.$refs.changelist.show3 = false
-            return
+          this.$Message.error("该工艺规程没有更改单！");
+          this.$refs.changelist.show3 = false;
+          return;
         }
-          this.$refs.changelist.show3 = true
-        })
+        this.$refs.changelist.show3 = true;
+      });
     }
   }
 };