@zhijiancloud/bpm 0.0.5 → 0.0.7

package/components/lib/bpmAudit/src/part/auditor/audit-new.vue

@@ -0,0 +1,534 @@
+<template>
+  <div class="audit-new">
+    <div class="submit-btns-container">
+      <el-button :disabled="submiting" @click="doOperation(2)">{{
+        selectOptions[1]["label"]
+      }}</el-button>
+      <el-button  type="primary" :disabled="submiting" @click="doOperation(1)">{{
+        selectOptions[0]["label"]
+      }}</el-button>
+    </div>
+
+    <el-dialog
+      :visible.sync="openAuditDlg"
+      class="audit-modal"
+      @close="onHide"
+      :modal="false"
+      center
+      width="60%"
+      :title="getViewFont"
+      @open="onOpen"
+    >
+      <div>
+        <el-form
+          ref="form"
+          class="audit-modal-content"
+          :model="curVal"
+          label-width="120px"
+        >
+          <el-form-item
+            v-if="form.result == 2 && showReject"
+            :label="$z('回退节点：', 'b2.common.fallback_node')"
+          >
+            <el-select v-model="form.reject_target" placeholder="">
+              <el-option
+                v-for="item in rejectTargetList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <component
+            :is="opt.component"
+            :key="opt.id"
+            :conf="opt"
+            :container="container"
+            v-for="opt in optAss"
+          >
+          </component>
+
+          <el-form-item
+            :required="isSignatureMust"
+            v-show="showSignature"
+            :label="$z('签名：', 'b2.common.sign')"
+          >
+            <bpm-signature ref="signature" v-model="form.signature"></bpm-signature>
+          </el-form-item>
+
+          <el-form-item
+            :required="isJudgmentMust"
+            :label="$z('填写意见：', 'b2.common.fill_comment')"
+            v-if="showJudgment"
+          >
+            <el-input
+              v-model="form.judgment"
+              type="textarea"
+              :placeholder="$z('请输入评审意见', 'b2.common.en_comment')"
+              :clearable="form.judgment ? true : false"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item
+            v-if="showPhoto"
+            :label="$z('拍照：', 'b2.common.photograph')"
+            :required="isPhotoMust"
+          >
+            <component
+              :is="componentName"
+              v-model="form.photos"
+              :value="form.photos"
+              :config="fieldConf"
+              :closeCheck="true"
+            >
+            </component>
+          </el-form-item>
+
+          <el-form-item
+            required
+            v-if="isOpenAudit"
+            :label="$z('审批日期：', 'b2.common.audit_date')"
+          >
+            <el-date-picker
+              ref="dateSelect"
+              v-model="form.auditTime"
+              type="datetime"
+              placeholder="选择日期时间"
+              :format="auditTimeFormat"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="onCancel"  :disabled="isSimulation ? false : submiting">取 消</el-button>
+        <el-button type="primary" @click="onSubmit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+
+<script>
+import _ from "lodash";
+import Vue from "vue";
+import { Dialog, DatePicker } from "element-ui";
+Vue.use(Dialog);
+Vue.use(DatePicker);
+import MulImage from "../../../../bpmMulImage/index";
+import Signature from "../../../../bpmSignature/index";
+
+Vue.use(MulImage);
+Vue.use(Signature);
+
+export default {
+  data() {
+    return {
+      curVal: {
+        result: 1,
+        judgment: "",
+        photos: [],
+        reject_target: "",
+        signature: "",
+        auditor_name: "",
+        audit_at: "",
+        auditor: "",
+      },
+    
+
+      openAuditDlg: false,
+      result: 1,
+      form: {
+        result: 1,
+        judgment: "",
+        photos: [],
+        signature: "",
+        auditTime: new Date().getTime()
+      },
+      passForm: {
+        result: 1,
+        judgment: "",
+        signature: "",
+        photos: [],
+        auditTime: new Date().getTime()
+      },
+      notPassForm: {
+        result: 2,
+        judgment: "",
+        photos: [],
+        signature: "",
+        reject_target: "",
+        auditTime: new Date().getTime()
+      },
+      canvasBox: null,
+      hasDraw: false,
+      degree: 0,
+      submiting: false,
+      openLastSign: false,
+      lastSign: "",
+      useNextUser: false,
+      selectOptions: [
+        {
+          label: zj.z('通过', 'b2.common.pass'),
+          value: 1,
+        },
+        {
+          label: zj.z('不通过', 'b2.common.fail'),
+          value: 2,
+        },
+      ],
+      optAss: [],
+      isOpenAudit: false,
+      auditTimeFormat: "YYYY-MM-DD HH:mm:ss"
+
+    };
+  },
+  props: ["value", "fieldConf", "row" ,"container"],
+  computed: {
+    
+    useDetail() {
+      return !!_.get(this.fieldConf, "detail_allow", null) && !!_.get(this.fieldConf, "detail_deny", null)
+    },
+    judgment() {
+      let result = this.result
+      let judgment = _.get(this.fieldConf, "judgment");
+      if (this.useDetail) {
+        judgment = result == 1 ? _.get(this.fieldConf, 'detail_allow.judgment') : _.get(this.fieldConf, 'detail_deny.judgment')
+      }
+      return judgment
+    },
+    showJudgment() {
+      return this.judgment == "yes" || this.judgment == "must";
+    },
+    signature() {
+      let result = this.result
+      let signature = _.get(this.fieldConf, "signature");
+      if (this.useDetail) {
+        signature = result == 1 ? _.get(this.fieldConf, 'detail_allow.signature') : _.get(this.fieldConf, 'detail_deny.signature')
+      }
+      return signature
+    },
+    allowColor() {
+      let color = _.get(this.fieldConf, "detail_allow.color", "#fff")
+      return color == "#fff" || color == "#ffffff" ? "primary" : color
+    },
+    denyColor() {
+      let color = _.get(this.fieldConf, "detail_deny.color", "#fff")
+      return color == "#fff" || color == "#ffffff" ? "primary" : color
+    },
+    showSignature() {
+      return this.signature == "yes" || this.signature == "must";
+    },
+    photo() {
+      let result = this.result
+      let photo = _.get(this.fieldConf, "photo");
+      if (this.useDetail) {
+        photo = result == 1 ? _.get(this.fieldConf, 'detail_allow.photo') : _.get(this.fieldConf, 'detail_deny.photo')
+      }
+      return photo
+    },
+    showPhoto() {
+      return this.photo == "yes" || this.photo == "must";
+    },
+    isJudgmentMust() {
+      return this.judgment == "must";
+    },
+    isSignatureMust() {
+      return this.signature == "must";
+    },
+    isPhotoMust() {
+      return this.photo == "must";
+    },
+    getCanvasBoxStyle() {
+      return {
+        height: "150px",
+        width: "100%",
+      };
+    },
+    componentName() {
+      return  "MulImagePc";
+    },
+    isMobile() {
+      return this.$q.platform.is.mobile;
+    },
+    getViewFont() {
+      let result = this.result;
+      let font = result == 1 ? zj.z('通过', 'b2.common.pass') : result == -1 ? "" : zj.z('不通过', 'b2.common.fail')
+      if (this.useDetail) {
+        font = result == 1 ? _.get(this.fieldConf, "detail_allow.text", zj.z('通过', 'b2.common.pass')) : result == -1 ? "" : _.get(this.fieldConf, "detail_deny.text", zj.z('不通过', 'b2.common.fail'))
+      }
+      return font;
+    },
+    userId() {
+      return _.get(this.$bpm.userInfo, "user_id", 0);
+    },
+    userName() {
+      return _.get(this.$bpm.userInfo, "user_name", "");
+    },
+    showReject() {
+      return !!_.get(this.container, "formSchema.reject_targets")
+    },
+    rejectTargetMap() {
+      let rejectTargets = _.get(this.container, "formSchema.reject_targets")
+      return _.keyBy(rejectTargets, "node")
+    },
+    rejectTargetList() {
+
+      console.log("this.container",this.container)
+
+      let rejectTargets = _.get(this.container, "formSchema.reject_targets")
+      let passedNodes = _.get(this.container, "_formData.passed_nodes")
+      let list = []
+      _.each(rejectTargets, rejectTarget => {
+        if (_.includes(passedNodes, rejectTarget.node) && rejectTarget.only_passed) {
+          list.push({
+            label: rejectTarget.name,
+            value: rejectTarget.node
+          })
+        }
+        else if (!rejectTarget.only_passed) {
+          list.push({
+            label: rejectTarget.name || zj.z("上一个节点", "b2.common.previous_node"),
+            value: rejectTarget.node || "last_id"
+          })
+        }
+      })
+      return list
+    },
+    isSimulation() {
+      return this.$bpm.isSimulation
+    }
+  },
+  created() {
+    this.loadProjBaseInfo()
+  },
+   destroyed() {
+    if(this.container){
+        this.container.$off("afterFormSubmit")
+    }
+  },
+  mounted() {
+    if(this.value){
+      let value = _.cloneDeep(this.value);
+      value.audit_at = value.audit_at * 1000
+      this.curVal = _.merge(this.curVal, value)
+    }
+
+    if(this.container){
+      this.container.$on("afterFormSubmit", (errors) => {
+      if (!errors && this.openLastSign && this.value.signature) {
+        this.$bpm.postEleSign(this.value.signature, this.useNextUser)
+      }
+    })
+    }
+    
+    if (this.useDetail) {
+      this.selectOptions = [
+        {
+          label: _.get(this.fieldConf, "detail_allow.text", zj.z('通过', 'b2.common.pass')),
+          value: 1,
+        },
+        {
+          label: _.get(this.fieldConf, "detail_deny.text", zj.z('不通过', 'b2.common.fail')),
+          value: 2
+        }
+      ]
+    }
+  },
+  methods: {
+    onHide() {
+      this.openAuditDlg = false; 
+    },
+    onOpen() {
+        if (this.result == 1) {
+        this.form = _.cloneDeep(this.passForm)
+        this.form.result = 1
+      }
+      else {
+        this.form = _.cloneDeep(this.notPassForm)
+        this.form.result = 2
+        if (this.rejectTargetList.length == 1) {
+          let result = _.get(this.rejectTargetList, "0.value")
+          this.form.reject_target = result
+        }
+        else {
+          this.form.reject_target = ""
+        }
+      }
+
+      console.log("this.result",this.result)
+      
+      this.form.auditTime = new Date().getTime()
+
+      this.handleInitSign()
+
+      if (this.value) {
+        let value = _.cloneDeep(this.value);
+        value.audit_at = value.audit_at * 1000
+        this.curVal = _.merge(this.curVal, value)
+        this.form = this.curVal
+      }
+    },
+    async onSubmit() {
+      let curVal = this.form;
+
+      console.log("curVal",curVal);
+
+
+      if (this.isRequired && !curVal.result) {
+          this.$message({
+          message:  "请选择审批结果",
+          type: 'warning',
+  
+        });
+        return;
+      }
+      if (this.isSignatureMust && !curVal.signature) {
+        this.$message({
+          message:  "请完成签名",
+          type: 'warning',
+  
+        });
+        return;
+      }
+      if (this.isJudgmentMust && !curVal.judgment) {
+        this.$message({
+          message:  "请填写意见",
+          type: 'warning',
+  
+        });
+        return;
+      }
+      if (this.isPhotoMust && _.isEmpty(curVal.photos)) {
+        this.$message({
+          message:  "请至少上传一张图片",
+          type: 'warning',
+  
+        });
+        return;
+      }
+
+      this._dealSubmit(curVal)
+      this.openAuditDlg = false;
+    },
+
+    _dealSubmit(form){
+      let value = {
+          result: form.result,
+          signature: form.signature,
+          judgment: form.judgment,
+          photos: form.photos,
+          audit_at: form.auditTime / 1000,
+          auditor:
+            (zj.app.accessInfo && zj.app.accessInfo.user_info.user_id) ||
+            this.userId,
+          auditor_name:
+            (zj.app.accessInfo && zj.app.accessInfo.user_info.user_name) ||
+            this.userName,
+        }
+        if (form.result == 2 && this.showReject) {
+          _.set(value, "reject_target", this.getRejectTarget(form.reject_target))
+        }
+        this.curVal = value;
+
+        this.$emit('change',this.curVal)
+
+        console.log("this.container",this.container);
+
+        let modal = this.container.$parent
+
+        if (modal) {
+           this.submiting = true
+          try {
+            modal.doOperation()
+          } catch (error) {
+            this.submiting = false
+          }
+          this.$bpm.$on("afterFormSubmit", ({ mode, errors }) => {
+            if (!errors) {
+              // 表单提交成功，刷新列表页
+              this.openAuditDlg = false
+              this.submiting = false
+              this.handleSaveSign()
+            }
+            else {
+              this.submiting = false
+            }
+          });
+
+        }
+      },
+ 
+    handleSaveSign() {
+      if (this.openLastSign && this.value.signature && this.useNextUser) {
+        this.$bpm.postEleSign(this.value.signature, this.useNextUser)
+      }
+    },
+
+     getRejectTarget(id) {
+      let rejectTargetMap = this.rejectTargetMap
+      return id == 'last_id' ? { type: 'RejectToLastUserNode' } : _.get(rejectTargetMap, id)
+
+    },
+
+    onCancel() {
+      this.openAuditDlg = false
+    },
+
+    handleInitSign() {
+      if (!this.showSignature) return
+      let userSign = this.$bpm.userSign
+      this.openLastSign = userSign.open
+      if (userSign.for_next_use) this.lastSign = userSign.signature
+      console.log("this.lastSign", this.lastSign)
+      if (this.openLastSign && this.lastSign && userSign.for_next_use) this.form.signature = userSign.signature
+      if (userSign.for_next_use && this.openLastSign) this.useNextUser = true
+
+    },
+    async loadProjBaseInfo() {
+      let info = await this.$bpm.getBaseSetting("open_audit")
+      let isOpen = info.value == 1 ? true : false
+      this.isOpenAudit = isOpen
+      let result = await this.$bpm.getBaseSetting("audit_dt_fmt")
+      this.auditFormat = result.value || this.auditFormat
+    },
+
+    async loadUserInfo() {
+      let info = await this.$bpm.requestAppendOrgParams({
+        url: "/uc/common/user_info/",
+        params: zj.utils.pageParam(),
+      });
+      info = _.get(info, "data.data")
+      this.$bpm.setUserInfo(info.user_info);
+    },
+
+    async doOperation(result) {
+
+      console.log("this.fieldConf",this.fieldConf)
+
+      setTimeout(() => {
+        let optAssIds = _.get(this.fieldConf, `opt_ass.${result}`)
+        let optAss = _.map(optAssIds, id => {
+          return _.get(this.container, `eleMap.${id}`)
+        })
+        optAss = _.compact(optAss)
+        this.optAss = optAss
+        let excludeElemIds = _.concat(optAssIds, this.fieldConf.id)
+        excludeElemIds = _.compact(excludeElemIds)
+        this.container.verfifyData(excludeElemIds, () => {
+          this.result = result
+          this.openAuditDlg = true
+          this.useNextUser = false
+          setTimeout(() => {
+            if (this.$refs.signature) this.$refs.signature.initCanvas();
+          }, 200)
+        })
+      }, 100)
+    }
+
+     }
+};
+</script>
+

package/components/lib/bpmAudit/src/part/auditor/audit-select.vue

@@ -0,0 +1,127 @@
+<template>         
+  <div>
+    <el-select v-model="form.result" :placeholder="$z('请选择回退节点', 'b2.common.select_back_to')">
+              <el-option
+                v-for="item in selectOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+  </div>
+
+</template>
+
+<script>
+export default {
+  props: ["value", "fieldConf", "row" ,"container"],
+  data() {
+    return {
+      selectOptions: [
+        {
+          label: zj.z('通过', 'b2.common.pass'),
+          value: 1,
+        },
+        {
+          label: zj.z('不通过', 'b2.common.fail'),
+          value: 2,
+        },
+      ],
+      form: {
+        result: "",
+        reject_target: ""
+      },
+    };
+  },
+  computed: {
+    userId() {
+      return _.get(this.$bpm.userInfo, "user_id", 0);
+    },
+    userName() {
+      return _.get(this.$bpm.userInfo, "user_name", "");
+    },
+    rejectTargetMap() {
+      let rejectTargets = _.get(this.field, "topContainer.formSchema.reject_targets")
+      return _.keyBy(rejectTargets, "node")
+    },
+    rejectTargetList() {
+      let rejectTargets = _.get(this.field, "topContainer.formSchema.reject_targets")
+      let passedNodes = _.get(this.field, "topContainer._formData.passed_nodes")
+      let list = []
+      _.each(rejectTargets, rejectTarget => {
+        if (_.includes(passedNodes, rejectTarget.node) && rejectTarget.only_passed) {
+          list.push({
+            label: rejectTarget.name,
+            value: rejectTarget.node
+          })
+        }
+        else {
+          list.push({
+            label: rejectTarget.name || zj.z("上一个节点", "b2.common.previous_node"),
+            value: rejectTarget.node || "last_id"
+          })
+        }
+      })
+      return list
+    }
+  },
+  watch: {
+    form: {
+      handler(val) {
+        let auditor = zj.app.accessInfo && zj.app.accessInfo.user_info.user_id || this.userId
+        if (!auditor) {
+          this.loadUserInfo()
+          this.$message({
+            message:  zj.z("当前网络加载有问题，请重新进入", 'b2.common.network_err'),
+            type: 'warning',
+          });
+  
+          return
+        }
+        if (val.result == 2 && this.showReject && !val.reject_target) {
+          // 打回节点必选
+          this.$message({
+            message:  zj.z("回退节点必填", "b2.common.back_to_required"),
+            type: 'warning',
+          });
+
+          return;
+        }
+        let value = {
+          result: val,
+          signature: "",
+          audit_at: new Date().getTime() / 1000,
+          auditor: zj.app.accessInfo && zj.app.accessInfo.user_info.user_id || this.userId,
+          auditor_name: zj.app.accessInfo && zj.app.accessInfo.user_info.user_name || this.userName,
+        }
+        if(val.result == 2 && this.showReject){
+          _.set(value, "reject_target", this.getRejectTarget(val.reject_target))
+        }
+        this.$emit("change",value)
+        this.$emit("input",value)
+      },
+      deep: true
+    }
+  },
+  methods: {
+    onDataLoaded(container) {
+      this.form.result = _.get(this.field.value, "result", "");
+    },
+    getRejectTarget(id) {
+      let rejectTargetMap = this.rejectTargetMap
+      return id == 'last_id' ? { type: 'RejectToLastUserNode' } : _.get(rejectTargetMap, id)
+
+    }
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.bpm-status {
+  min-height: 24px;
+  border-radius: 3px;
+}
+</style>
+
+