工艺规程、工艺更改单审批相关

pages/technology/add.vue

@@ -196,7 +196,15 @@ export default {
       },
       rules: {
         name: [{ required: true, message: "必填", trigger: "blur" }],
-        code: [{ required: true, message: "必填", trigger: "blur" }]
+        code: [{ required: true, message: "必填", trigger: "blur" }],
+        routingType: [
+          {
+            required: true,
+            message: "请选择工艺类型",
+            trigger: "change",
+            type: "number"
+          }
+        ]
       },
       parms: {
         app: "technology",

pages/technology/details/routinghcorder/edit.vue

@@ -68,7 +68,12 @@
       </Col>
       <Col span="8">
         <FormItem :label="l('effectiveDate')" prop="effectiveDate">
-            <DatePicker type="date" v-model="entity.effectiveDate" style="width:100%" format="yyyy/MM/dd"></DatePicker>
+          <DatePicker
+            type="date"
+            v-model="entity.effectiveDate"
+            style="width:100%"
+            format="yyyy/MM/dd"
+          ></DatePicker>
         </FormItem>
       </Col>
       <Col span="24">
@@ -151,6 +156,7 @@ export default {
       this.$refs.form.validate(v => {
         if (v) {
           this.disabled = true;
+          this.entity.status = 1;//修改后（未通过审核或新建的）的状态都为待送审
           Api.update(this.entity)
             .then(r => {
               this.disabled = false;
@@ -174,42 +180,42 @@ export default {
     },
     handleImg(e) {
       console.warn(e);
-        let file = null
+      let file = null;
       if (
         e.clipboardData &&
         e.clipboardData.items[0] &&
         e.clipboardData.items[0].type &&
-          e.clipboardData.items[0].type.indexOf('image') > -1
+        e.clipboardData.items[0].type.indexOf("image") > -1
       ) {
         //这里就是判断是否有粘贴进来的文件且文件为图片格式
-          file = e.clipboardData.items[0].getAsFile()
-          let reader = new FileReader()
-          reader.readAsDataURL(file)
+        file = e.clipboardData.items[0].getAsFile();
+        let reader = new FileReader();
+        reader.readAsDataURL(file);
         setTimeout(() => {
-            var img = '<img src="' + reader.result + '" alt=""/>'
-            this.entity.beforeChangeContent += img
-          }, 1000)
+          var img = '<img src="' + reader.result + '" alt=""/>';
+          this.entity.beforeChangeContent += img;
+        }, 1000);
 
         // new R
       }
     },
     handleImg1(e) {
       console.warn(e);
-        let file = null
+      let file = null;
       if (
         e.clipboardData &&
         e.clipboardData.items[0] &&
         e.clipboardData.items[0].type &&
-          e.clipboardData.items[0].type.indexOf('image') > -1
+        e.clipboardData.items[0].type.indexOf("image") > -1
       ) {
         //这里就是判断是否有粘贴进来的文件且文件为图片格式
-          file = e.clipboardData.items[0].getAsFile()
-          let reader = new FileReader()
-          reader.readAsDataURL(file)
+        file = e.clipboardData.items[0].getAsFile();
+        let reader = new FileReader();
+        reader.readAsDataURL(file);
         setTimeout(() => {
-            var img = '<img src="' + reader.result + '" alt=""/>'
-            this.entity.afterChangeContent += img
-          }, 1000)
+          var img = '<img src="' + reader.result + '" alt=""/>';
+          this.entity.afterChangeContent += img;
+        }, 1000);
 
         // new R
       }

pages/technology/details/routinghcorder/index.vue

@@ -173,7 +173,7 @@ export default {
                   attrs: { oprate: "edit" },
                   on: { click: () => this.edit(params.row.id) }
                 },
-                params.row.status == 1 ? "编辑" : ""
+                params.row.status == 1||params.row.status == 4 ? "编辑" : ""
               ),
               h(
                 "op",
@@ -181,7 +181,7 @@ export default {
                   attrs: { oprate: "delete" },
                   on: { click: () => this.remove(params.row.id) }
                 },
-                params.row.status == 1 ? "删除" : ""
+                params.row.status == 1||params.row.status == 4 ? "删除" : ""
               ),
               h(
                 "op",

pages/technology/index.vue

@@ -275,7 +275,7 @@ export default {
         {
           title: "操作",
           key: "action",
-          width: 320,
+          width: 260,
           align: "left",
           render: (h, params) => {
             return h("div", { class: "action" }, [