物料审核

pages/handle/api.js

@@ -27,5 +27,7 @@ export default {
     terminate(params) {
         return Api.post(`${workflowUrl}/instance/terminate`, params);
     },
-
+    listTable(params){
+        return Api.post(`${systemUrl}/custompropertydefinition/list`,params); //物料扩展属性
+    },
 }
\ No newline at end of file

pages/handle/examine13/detail.vue

+<template>
+  <div class="new-detail" style="width:90%;margin:0 auto">
+    <Row>
+      <Filed :span="8" name="编码：">{{entity.code}}</Filed>
+      <Filed :span="8" name="名称：">{{entity.name}}</Filed>
+      <Filed :span="8" name="状态：">
+        <State code="materail.category.status" :value="parseInt(entity.status)" />
+      </Filed>
+      <Filed :span="8" name="版本：">{{entity.version}}</Filed>
+      <Filed :span="8" name="描述：">{{entity.description}}</Filed>
+    </Row>
+    <Divider orientation="left">扩展属性</Divider>
+    <Row>
+      <Filed v-for="li in fileds" :key="li.field" :span="li.span" :name="li.title+'：'">
+        <State v-if="li.dataType==3" :code="li.note" :value="entity[li.field]" />
+        <div v-else-if="li.dataType==8">{{entity[li.field]}}</div>
+        <div v-else-if="li.dataType==5" v-html="entity[li.field]"></div>
+        <span v-else>{{entity[li.field]}}</span>
+        <span v-if="li.unitName" v-text="li.unitName" class="ml10"></span>
+      </Filed>
+    </Row>
+  </div>
+</template>
+<script>
+import Api from "../api";
+
+export default {
+  name: "detail",
+  components: {},
+  props: {
+    idVal: {
+      type: String,
+      default: ""
+    }
+  },
+  async fetch({ store, params }) {
+    await store.dispatch("loadDictionary"); // 加载数据字典
+  },
+  data() {
+    return {
+      entity: {
+        state: ""
+      },
+      fileds: []
+    };
+  },
+  created() {
+    this.dataImmut = [];
+    this.dataMut = [];
+
+    Api.get({ Id: this.idVal }).then(r => {
+      console.log(r);
+      if (r.success) {
+        let farmData = {};
+        farmData = JSON.parse(r.result.formData);
+        console.log(farmData);
+        this.entity = farmData;
+        let conditions = [
+          {
+            conditionalType: "Equal",
+            fieldName: "categoryId",
+            fieldValue: farmData.rootCategoryId
+          }
+        ];
+
+        Api.listTable({
+          conditions: conditions,
+          sortBy: "id",
+          isDesc: false
+        }).then(r => {
+          if (r.result) {
+            this.fileds = r.result.filter(function(item) {
+              item.span = 8;
+              if (item.dataType == 8 || item.dataType == 5) {
+                item.span = 24;
+              }
+              return item.fieldType != 1;
+            });
+            this.fileds.map(u => {
+              let v = "";
+              if (u.dataType == 1 || u.dataType == 2) {
+                v = 0;
+              }
+              this.$set(this.entity, u.filed, v);
+            });
+          }
+        });
+      } else {
+        this.$Message.error("加载失败");
+      }
+    });
+  },
+  methods: {
+    load(v) {}
+  },
+  watch: {}
+};
+</script>
\ No newline at end of file

pages/handle/examine13/index.vue

+<template>
+  <div style="padding:40px 0">
+    <Detail :idVal="detailId" />
+    <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
+    <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
+      <Form :model="formMyCheck" :label-width="100" :rules="ruleValidate" inline ref="formValidate">
+        <Row>
+          <Col span="18">
+            <FormItem label="审批意见：">
+              <RadioGroup v-model="formMyCheck.radioSp" style="width:200px">
+                <Radio label="通过"></Radio>
+                <Radio label="驳回"></Radio>
+                <Radio label="终止"></Radio>
+              </RadioGroup>
+            </FormItem>
+            <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
+              <Select
+                style="width:200px"
+                clearable
+                transfer
+                placeholder="请选择驳回节点"
+                v-model="formMyCheck.rejectToNodeId"
+              >
+                <Option value class="option-text">请选择驳回节点</Option>
+                <Option
+                  v-for="(item, index) in nodeList"
+                  :value="item.value"
+                  :label="item.label"
+                  :key="index"
+                  :disabled="item.statu > 0 ? false : true"
+                ></Option>
+              </Select>
+              <RadioGroup type="button" size="small" @on-change="changeToNode">
+                <Radio label="1">上一节点</Radio>
+                <Radio label="2">第一节点</Radio>
+              </RadioGroup>
+            </FormItem>
+            <FormItem
+              label="原因："
+              v-if="
+                formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
+              "
+              prop="comment"
+            >
+              <Input
+                v-model="formMyCheck.comment"
+                style="width:400px;margin-left:10px"
+                placeholder="请输入原因"
+              />
+            </FormItem>
+          </Col>
+          <Col span="6" style="text-align:right;padding-right:40px">
+            <Button type="primary" @click="nextCheckOk">下一步</Button>
+          </Col>
+        </Row>
+      </Form>
+    </div>
+
+    <Modal v-model="modalCheckNo" title="切片文件审批" width="800" :scrollable="true">
+      <br />
+      <h4>
+        您确定
+        <span class="new-red">{{ statuTitle }}</span> 此物料审批？
+      </h4>
+      <br />
+      <div slot="footer">
+        <Button @click="modalCheckNo = false">取消</Button>
+        <Button type="primary" @click="checkFalse">确定</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+import Api from '../api'
+import Detail from './detail'
+import Process from '../process'
+
+export default {
+  layout: 'empty',
+  name: 'Index',
+  components: {
+    Detail,
+    Process
+  },
+  data() {
+    return {
+      currentUserId: 0,
+      formMyCheck: {
+        radioSp: '通过',
+        comment: '',
+        workHours: 0, //工时
+        printPeriod: 0, //打印周期
+        equipment: '', //设备
+        materialWeight: 0, //材料重量
+        rejectToNodeId: null
+      },
+      modalCheckOk: false,
+      modalCheckNo: false,
+      detailId: null,
+      statuTitle: '',
+      footerStatu: null, //是否显示footer
+      getDetailResults: [], //getdetail返回数据
+      getDetailResultOrder: [], //getdetail返回订单detail数据
+      getDetailProcess: [], //getdetail返回process信息
+      getDetailRecords: [], //getdetail返回当前records信息
+      passId: null, //通过审批/驳回/终止接口 id，
+      nodeList: [], //返回节点
+      currentNodeID: null, //当前节点
+      firstNodeID: null, //第一个节点
+      preNodeID: null, //上一个节点
+      nextNodeUserIdList: [], //通过时提交的下一个节点UserId
+      testObj: {},
+      ruleValidate: {
+        rejectToNodeId: [
+          {
+            required: true,
+            message: '请选择驳回节点',
+            type: 'number',
+            trigger: 'change'
+          }
+        ],
+        comment: [
+          {
+            required: true,
+            message: '请输入原因',
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
+  },
+  props: {},
+  async fetch({ store, params }) {
+    await store.dispatch('loadDictionary') // 加载数据字典
+  },
+  created() {
+    this.currentUserId=this.$store.state.userInfo.userId
+    this.detailId = this.$http.common.getquerystring('id')
+    this.footerStatu = this.$http.common.getquerystring('statu')
+    this.getDetailInfos(this.detailId)
+  },
+  methods: {
+    nextCheckOk() {
+      if (this.formMyCheck.radioSp == '通过') {
+        this.modalCheckNo = true
+      } else if (this.formMyCheck.radioSp == '驳回') {
+        this.$refs['formValidate'].validate((valid) => {
+          if (valid) {
+            this.modalCheckNo = true
+            this.statuTitle = '驳回'
+          } else {
+          }
+        })
+      } else {
+        this.$refs['formValidate'].validate((valid) => {
+          if (valid) {
+            this.modalCheckNo = true
+            this.statuTitle = '终止'
+          } else {
+          }
+        })
+      }
+    },
+    getDetailInfos(idVal) {
+      this.getDetailRecords = []
+      let param = {
+        Id: idVal
+      }
+      Api.getdetail(param).then((r) => {
+        this.testObj = r
+        if (r.success) {
+          this.currentNodeID = r.result.currentNodeId
+          this.passId=r.result.currentRecordId
+          this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人
+          this.getNodes(r.result.nodes)
+        } else {
+          this.$Message.error('加载失败')
+        }
+      })
+    },
+    //获取流程节点
+    getNodes(nodes) {
+      this.nodeList = []
+      nodes.forEach((data) => {
+        let nodeObj = {}
+        nodeObj.value = data.id
+        nodeObj.label = data.name
+        nodeObj.statu = 1
+        this.nodeList.push(nodeObj)
+      })
+      //第一节点node的ID
+      this.firstNodeID = this.nodeList[0].value
+      //根据当前nodeid找到上一节点的nodeId
+      var index = this.nodeList.findIndex(
+        (item) => item.value == this.currentNodeID
+      )
+      if (index > 0) {
+        this.preNodeID = this.nodeList[index - 1].value
+      } else {
+        this.preNodeID = this.nodeList[0].value
+      }
+    },
+    changeToNode(val) {
+      if (val == '1') {
+        this.formMyCheck.rejectToNodeId = this.preNodeID
+      } else {
+        this.formMyCheck.rejectToNodeId = this.firstNodeID
+      }
+    },
+    //审批通过
+    checkOk() {
+      //   alert(this.passId)
+      let param = {
+        id: this.passId,
+        comment: '',
+        nextOperationIdList: this.nextNodeUserIdList,
+        data: {}
+      }
+      // alert(JSON.stringify(param))
+      Api.pass(param).then((r) => {
+        if (r.success) {
+          this.$Message.success('审批通过成功')
+          this.modalCheckNo = false
+        } else {
+          this.$Message.error('审批通过失败')
+          this.modalCheckNo = true
+        }
+      })
+    },
+    //审批驳回
+    checkNo() {
+      //   alert(this.passId)
+      let param = {
+        id: this.passId,
+        comment: this.formMyCheck.comment,
+        rejectToNodeId: this.formMyCheck.rejectToNodeId
+      }
+      // alert(JSON.stringify(param))
+      Api.reject(param).then((r) => {
+        if (r.success) {
+          this.$Message.success('驳回审批成功')
+          this.modalCheckNo = false
+        } else {
+          this.$Message.error('加载失败')
+          this.modalCheckNo = true
+        }
+      })
+    },
+    //审批终止
+    checkCancel() {
+      // alert(this.passId)
+      let param = {
+        id: this.passId,
+        comment: this.formMyCheck.comment
+      }
+      //alert(JSON.stringify(param))
+      Api.terminate(param).then((r) => {
+        if (r.success) {
+          this.$Message.success('终止审批成功')
+          this.modalCheckNo = false
+        } else {
+          this.$Message.error('加载失败')
+          this.modalCheckNo = true
+        }
+      })
+    },
+    //终止或驳回
+    checkFalse() {
+      if (this.formMyCheck.radioSp == '驳回') {
+        this.checkNo()
+      } else if (this.formMyCheck.radioSp == '终止') {
+        this.checkCancel()
+      } else if (this.formMyCheck.radioSp == '通过') {
+        this.checkOk()
+      }
+      this.footerStatu = 3
+    },
+    l(key) {
+      key = 'OrderDataReview' + '.' + key
+      return this.$t(key)
+    }
+  },
+  watch: {}
+}
+</script>

pages/handle/index.vue

@@ -167,7 +167,7 @@ export default {
                 {
                   attrs: {
                     oprate: "detail",
-                    title: this.tabIndex == 2? "审核":  "查看" 
+                    title: this.tabIndex == 2 ? "审核" : "查看"
                   },
                   on: {
                     click: () => {
@@ -294,6 +294,9 @@ export default {
         case "bd2cb81a-d955-4b68-ae67-bcf7f92e8cb8": //切片文件审批
           types = 12;
           break;
+        case "b6303ddc-8b5e-40a3-a51b-294657d1d913": //物料审批
+          types = 13;
+          break;
         default:
           types = 1;
           break;

pages/materiel/masterData/edit.vue

@@ -17,7 +17,7 @@
             label="状态"
             prop="status"
             placeholder="请选择"
-            v-if="entity.status==3||entity.status==2"
+            v-if="entity.status==3||entity.status==4"
           >
             <Dictionary
               code="material.main.status"

pages/materiel/masterData/masterData.vue

@@ -182,7 +182,7 @@ export default {
                   attrs: { oprate: "edit" },
                   on: { click: () => this.send(params.row) }
                 },
-                "送审"
+                params.row.status == 0 || params.row.status == 1 ? "送审" : ""
               )
             ]);
           }
@@ -259,14 +259,16 @@ export default {
             if (u.dataType == 3) {
               col.code = u.note;
             }
-            if(u.unitName){
-             var units= this.$store.getters.dictionaryByKey("material.main.unitName");
+            if (u.unitName) {
+              var units = this.$store.getters.dictionaryByKey(
+                "material.main.unitName"
+              );
 
-             let item=units.filter(p=>{
-               return p.code==u.unitName;
-             })
-             console.log(units,item)
-              col.title+="("+item[0].name+")";
+              let item = units.filter(p => {
+                return p.code == u.unitName;
+              });
+              console.log(units, item);
+              col.title += "(" + item[0].name + ")";
             }
             return col;
           });

pages/materiel/masterData/submit.vue

@@ -258,6 +258,7 @@ export default {
           codeList.push(this.entity.code);
         } else {
          codeList.push(this.eid);
+         
         }
         idList.push(this.eid);
       } else {
@@ -267,6 +268,7 @@ export default {
             codeList.push(e.code);
           } else {
              codeList.push(e.id);
+        
           }
         });
       }
@@ -277,7 +279,7 @@ export default {
         .replace("]", "")
         .replace(/\"/g, "");
       this.ModalInfoStaut = "orderSendReview";
-      this.metCodesStrTxt = "确定物料 " + metCodesStr + "？";
+      this.metCodesStrTxt = "确定送审此物料 " + metCodesStr + "？";
       this.ModalInfo = true;
     },
     modalInfoOk() {