routingchangeorder

i18n/locale/zh-CN.js

@@ -1397,7 +1397,7 @@ export default {
     printData: '发行日期',
     executiveBranch: '执行部门',
     executiveBranchId: '执行部门Id',
-    handlingOpinionsId: '',
+    handlingOpinionsId: '在制品处理意见Id',
     handlingOpinions: '在制品处理意见',
     beforeChangeContent: '变更前内容描述（附图）',
     afterChangeContent: '变更后内容描述（附图）',

pages/technology/details/edit.vue

@@ -157,6 +157,27 @@ export default {
     handleClose() {
       this.$emit("on-close");
     },
+    handleImg(e) {
+      console.warn(e);
+      //   let file = null
+      //   if (
+      //     e.clipboardData &&
+      //     e.clipboardData.items[0] &&
+      //     e.clipboardData.items[0].type &&
+      //     e.clipboardData.items[0].type.indexOf('image') > -1
+      //   ) {
+      //     //这里就是判断是否有粘贴进来的文件且文件为图片格式
+      //     file = e.clipboardData.items[0].getAsFile()
+      //     let reader = new FileReader()
+      //     reader.readAsDataURL(file)
+      //     setTimeout(() => {
+      //       var img = '<img src="' + reader.result + '" alt=""/>'
+      //       this.bugForm.content += img
+      //     }, 1000)
+
+      //     // new R
+      //   }
+    },
     l(key) {
       key = "routing_detail" + "." + key;
       return this.$t(key);

pages/technology/details/routinghcorder/api.js

@@ -4,6 +4,12 @@ export default {
   paged(params) {
     return Api.post(`${technologyUrl}routingheaderchangeorder/paged`, params);
   },
+  getpaged1(params) {//获取审批流程
+    return Api.get(`${designUrl}/routingheaderchangeorder/getpaged1`, params);
+  },
+  GetCodeByType(params) {//获取工艺更改单号
+    return Api.get(`${designUrl}/routingheader/GetCodeByType`, params);
+  },
   get(params) {
     return Api.get(`${technologyUrl}routingheaderchangeorder/get`, params);
   },

pages/technology/details/routinghcorder/changeInfos.vue

+<template>
+  <div class="detail">
+    <Row>
+      <Filed span="12" :name="'工艺更改单'">{{info.changeInfo.changeorder_code}}</Filed>
+      <Filed span="12" :name="'提出人'">{{info.changeInfo.propose_user_name}}</Filed>
+      <Filed span="12" :name="'申请部门'">{{info.changeInfo.department_name}}</Filed>
+      <Filed span="12" :name="'技术文件名称'">{{info.changeInfo.technical_name}}</Filed>
+      <Filed span="12" :name="'技术文件编号'">{{info.changeInfo.technical_code}}</Filed>
+      <Filed span="12" :name="'执行部门'">{{info.changeInfo.executive_branch}}</Filed>
+      <Filed span="12" :name="'数量'">{{info.changeInfo.quantity}}</Filed>
+      <Filed span="12" :name="'发行日期'">{{info.changeInfo.print_data}}</Filed>
+      <Filed span="12" :name="'更改原因'">{{info.changeInfo.change_reason}}</Filed>
+      <Filed span="12" :name="'有效日期'">{{info.changeInfo.effective_date}}</Filed>
+   
+      <Filed span="12" :name="'更改后版本号'">
+        <state
+          code="Process.Routing.version"
+          :value="info.changeInfo.changed_version+''"
+          type="text"
+        ></state>
+      </Filed>
+      <Filed span="12" :name="'在制品意见'">
+        <state
+          code="Process.Routing.opinion"
+          :value="info.changeInfo.handling_opinions+''"
+          type="text"
+        ></state>
+      </Filed>
+    </Row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "changeInfos",
+  props: {
+    info:Object,
+    default:{},
+  },
+  async fetch({ store, params }) {
+    await store.dispatch("loadDictionary"); // 加载数据字典
+  },
+  data() {
+    return {};
+  },
+  methods: {
+   
+    l(key) {
+      key = "orderInfo" + "." + key;
+      return this.$t(key);
+    }
+  }
+};
+</script>
+<style lang="less">
+.detail {
+  display: table;
+  border-collapse: collapse;
+  .ivu-row {
+    display: table-row;
+    .filed-col {
+      display: table-cell;
+      margin: 0 0 -1px 0;
+      line-height: 30px;
+      box-sizing: border-box;
+      .label {
+        background: #e8eaf1;
+        display: inline-block;
+        width: 120px;
+        text-align: right;
+        padding: 0 5px;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file

pages/technology/details/routinghcorder/changeSendReview.vue

+
+<template>
+  <Modal
+    v-model="modalInfo"
+    title="工艺更改单送审"
+    width="800"
+    :mask-closable="false"
+    :scrollable="true"
+    fullscreen
+  >
+    <div style="width:80%;margin:0 auto">
+      <changeInfos v-if="info.status" :info="info"></changeInfos>
+      <Process ref="userProcess" schemaIdVal="d0cdafe3-2341-4499-a4f5-278ef0f30740" />
+    </div>
+    <div slot="footer">
+      <Button @click="modalInfo = false">取消</Button>
+      <Button type="primary" @click="upSave">确定送审</Button>
+    </div>
+    <Modal
+      v-model="modalchangeInfo"
+      title="送审提示"
+      width="800"
+      :mask-closable="false"
+      :scrollable="true"
+    >
+      <h2 class="center">确定送审该工艺更改单吗？</h2>
+      <div slot="footer">
+        <Button @click="modalchangeInfo = false">取消</Button>
+        <Button type="primary" @click="upSave1">确定</Button>
+      </div>
+    </Modal>
+  </Modal>
+</template>
+
+<script>
+import changeInfos from "./changeInfos.vue";
+import Process from "@/components/orderOperator/process";
+import Api from "./api";
+export default {
+  name: "changeSendReview",
+  components: {
+    changeInfos,
+    Process
+  },
+  data() {
+    return {
+      modalchangeInfo: false,
+      modalInfo: false,
+      data3: [],
+      userlist: [],
+      changeorder_code: "",
+      loading: false,
+      info: {
+        status: true,
+        changeInfo: []
+      },
+      dataListRetrunNew: {
+        schemaId: "d0cdafe3-2341-4499-a4f5-278ef0f30740", //schemaId
+        idList: [], //id List
+        codeList: [], //编号List
+        operatorIdList: [] //操作员id
+      },
+      operatorIdList: [] //操作员id
+    };
+  },
+  created() {},
+  mounted() {},
+  methods: {
+    upSave() {
+      this.modalchangeInfo = true;
+    },
+    upSave1() {
+      let parmas = {
+        changeorder_code: this.changeorder_code,
+        pageindex: 1,
+        pageSize: 10
+      };
+      Api.getpaged1(parmas).then(res => {
+        this.data3 = res.result.items;
+        let operatorIdList = this.returnDataList();
+        let itemCode = this.changeorder_code;
+        this.dataListRetrunNew.idList = [];
+        this.dataListRetrunNew.codeList = [];
+        this.dataListRetrunNew.idList.push(this.data3[0].id);
+        this.dataListRetrunNew.codeList.push(itemCode);
+        this.dataListRetrunNew.operatorIdList = operatorIdList;
+        this.$http.order.batchstart(this.dataListRetrunNew).then(response => {
+          if (response.success) {
+            this.$Message.info("工艺更改单送审成功!");
+          } else {
+            this.$Message.error("送审失败!");
+          }
+          this.modalInfo = false;
+          this.modalchangeInfo = false;
+        });
+      });
+    },
+    returnDataList() {
+      let ues = this.$refs.userProcess;
+      this.operatorIdList = ues.immutData;
+      return this.operatorIdList;
+    }
+  }
+};
+</script>

pages/technology/details/routinghcorder/edit.vue

@@ -180,6 +180,27 @@ export default {
     handleClose() {
       this.$emit("on-close");
     },
+    handleImg(e) {
+      console.warn(e);
+      //   let file = null
+      //   if (
+      //     e.clipboardData &&
+      //     e.clipboardData.items[0] &&
+      //     e.clipboardData.items[0].type &&
+      //     e.clipboardData.items[0].type.indexOf('image') > -1
+      //   ) {
+      //     //这里就是判断是否有粘贴进来的文件且文件为图片格式
+      //     file = e.clipboardData.items[0].getAsFile()
+      //     let reader = new FileReader()
+      //     reader.readAsDataURL(file)
+      //     setTimeout(() => {
+      //       var img = '<img src="' + reader.result + '" alt=""/>'
+      //       this.bugForm.content += img
+      //     }, 1000)
+
+      //     // new R
+      //   }
+    },
     l(key) {
       key = "routing_header_changeorder" + "." + key;
       return this.$t(key);

pages/technology/details/routinghcorder/index.vue

@@ -18,7 +18,7 @@
         <Button type="primary" @click="add">新增</Button>
       </template>
     </DataGrid>
-    <Modal v-model="modal" :title="title" width="1200" footer-hide>
+    <Modal v-model="modal" :title="title" width="1200" footer-hide scrollable>
       <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
     </Modal>
   </div>
@@ -100,13 +100,13 @@ export default {
         {
           key: "quantity",
           title: this.l("quantity"),
-          align: "left",
+          align: "right",
           high: true
         },
         {
           key: "status",
           title: this.l("status"),
-          align: "left",
+          align: "center",
           high: true,
           code: "unProduct.repairstatus"
         },

pages/technology/details/routinghcorder/search.vue

@@ -18,7 +18,7 @@
       </Col>
       <Col :span="12" v-if="condition.printData.show">
         <FormItem :label="l('printData')" prop="printData">
-          <DatePicker type="daterange" v-model="condition.printData.value"></DatePicker>
+          <DatePicker type="daterange" v-model="condition.printData.value" style="width:100%"></DatePicker>
         </FormItem>
       </Col>
 
@@ -60,7 +60,11 @@
       </Col>
       <Col :span="12" v-if="condition.changedVersion.show">
         <FormItem :label="l('changedVersion')" prop="changedVersion">
-          <Input v-model="condition.changedVersion.value"></Input>
+           <dictionary
+              code="Process.Routing.version"
+              v-model="condition.changedVersion.value"
+              style="width:100%"
+            ></dictionary>
         </FormItem>
       </Col>
       <Col :span="12" v-if="condition.quantity.show">
@@ -117,7 +121,7 @@
       </Col>
       <Col :span="12" v-if="condition.creationTime.show">
         <FormItem :label="$t('creationTime')" prop="creationTime">
-          <DatePicker type="daterange" v-model="condition.creationTime.value"></DatePicker>
+          <DatePicker type="daterange" v-model="condition.creationTime.value" style="width:100%"></DatePicker>
         </FormItem>
       </Col>
       <Col :span="12" v-if="condition.lastModifierUserId.show">
@@ -127,7 +131,7 @@
       </Col>
       <Col :span="12" v-if="condition.lastModificationTime.show">
         <FormItem :label="$t('lastModificationTime')" prop="lastModificationTime">
-          <DatePicker type="daterange" v-model="condition.lastModificationTime.value"></DatePicker>
+          <DatePicker type="daterange" v-model="condition.lastModificationTime.value" style="width:100%"></DatePicker>
         </FormItem>
       </Col>
     </Row>