Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

-<!--
- * @Description:
- * @Autor: renchao
- * @LastEditTime: 2023-05-17 10:41:45
--->
-<template>
-  <div class="from-clues">
-    <div class="invalid-title">
-      <i class="el-icon-question invalid-icon"></i>
-      <div class="invalid-body">您是否确定终止该业务办理？</div>
-    </div>
-    <div class="invalid-reson">终止原因：</div>
-    <el-input
-      v-model="stopMessage"
-      placeholder="请输入终止原因"
-      type="textarea"
-      :rows="4"></el-input>
-    <el-button style="float: right">取消</el-button>
-    <el-button type="primary" @click="onSubmit" style="float: right">退件</el-button>
-  </div>
-</template>
-
-<script>
-  import { stopTask } from "@/api/workFlow.js";
-  export default {
-    props: {
-      formData: {
-        type: Object,
-        default: {},
-      },
-    },
-    data () {
-      return {
-        stopMessage: "",
-      };
-    },
-    methods: {
-      /**
-       * @description: onSubmit
-       * @author: renchao
-       */
-      onSubmit () {
-        stopTask({
-          bsmSlsq: this.formData.bsmSlsq,
-          bestepid: this.formData.bestepid,
-          stopMessage: this.stopMessage,
-        }).then((res) => {
-          this.$message.success("终止成功");
-          setTimeout(() => {
-            // window.opener.location.reload(); //刷新父窗口
-            if (window.opener && window.opener.getBpageList) {
-              window.opener.getBpageList();
-            } else {
-              window.opener.frames[0].getBpageList();
-            }
-            window.close();
-            this.$emit("input", false);
-          }, 1000);
-        });
-      },
-    },
-  };
-</script>
-<style scoped lang="scss">
-  @import "~@/styles/mixin.scss";
-  .invalid-title {
-    display: flex;
-    align-content: center;
-
-    .invalid-icon {
-      color: rgb(254, 148, 0);
-      font-size: 34px;
-      margin-right: 10px;
-    }
-
-    .invalid-body {
-      line-height: 40px;
-      margin-bottom: 10px;
-    }
-  }
-
-  .invalid-reson {
-    margin-bottom: 10px;
-  }
-
-  .dialog-footer {
-    margin-top: 10px;
-    display: flex;
-    justify-content: flex-end;
-  }
-</style>

@@ -17,16 +17,18 @@
       </el-form>
       <el-form ref="queryForm" label-width="180px" v-else>
         <el-form-item label="">
-        此环节为流程最后环节，转出后流程将结束
+          此环节为流程最后环节，转出后流程将结束
         </el-form-item>
       </el-form>
-      <div class="invalid-reson">转出原因：</div>
+      <div class="invalid-reson">审批意见：</div>
       <el-input
+        class="opinion"
         v-model="shyj"
-        placeholder="请输入转出原因"
+        placeholder="请输入审批意见"
         type="textarea"
         :rows="4"
       ></el-input>
+      <!-- <el-button class="opinion_btn" @click="commonOpinion">常用意见</el-button> -->
       <el-button style="float: right" @click="cancelBack">取消转出</el-button>
       <el-button type="primary" @click="submitForm" style="float: right"
         >确定转出</el-button
@@ -38,36 +40,56 @@
 <script>
 import { completeTask, getNextLinkInfo } from "@/api/workFlow.js";
 import { popupCacel } from "@/utils/popup.js";
+import { mapGetters } from "vuex";
 export default {
-  components: {},
+   computed: {
+  },
   props: {
     formData: {
       type: Object,
       default: {},
     },
   },
+
   data() {
     return {
       queryForm: {},
       shyj: "",
     };
   },
+
+ watch: {
+    yjsqOptions: {
+      handler(val) {
+        this.add(val);
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
   mounted() {
     //  this.queryForm= this.queryForm.obj
-    console.log("formDataformDataformData", this.formData);
   },
   methods: {
     /**
      * @description: submitForm
      * @author: renchao
      */
+    commonOpinion() {
+      this.$popup('常用意见',"workflow/components/dialog/commonOpinion",{
+        title:"常用意见",
+  width: '75%', // 初始化75% 不需要改的话 可以直接不要
+  formData:{}, // 父组件传给子组件的参数
+  cancel: function () {}, //取消事件的回调 没有按钮可以不需要
+  confirm: function () {} //确认事件的回调 没有按钮可以不需要
+})
+    },
     submitForm() {
       this.queryForm = {
         bsmSlsq: this.formData.bsmSlsq,
         shyj: this.shyj,
         stepform: JSON.stringify(this.formData.tabList),
       };
-      console.log("this.queryForm", this.queryForm);
       completeTask(this.queryForm).then((res) => {
         if (res.code === 200) {
           this.$message.success("转件成功");
@@ -77,8 +99,8 @@ export default {
           //   window.close();
           //   this.$emit("input", false);
           // }, 1000);
-            popupCacel();
-               setTimeout(() => {
+          popupCacel();
+          setTimeout(() => {
             // window.opener.location.reload(); //刷新父窗口
             if (window.opener && window.opener.getBpageList) {
               window.opener.getBpageList();
@@ -88,12 +110,23 @@ export default {
             window.close();
             this.$emit("input", false);
           }, 1000);
-        }else{
+        } else {
           this.$message.error(res.message);
         }
       });
     },
     /**
+     * @description: add
+     * @param {*} val
+     * @author: renchao
+     */
+    add(val) {
+      if (val != "") {
+        this.shyj;
+      }
+    },
+
+    /**
      * @description: closeDialog
      * @author: renchao
      */
@@ -109,4 +142,15 @@ export default {
   margin-top: 20px;
   margin-right: 10px;
 }
+
+.opinion {
+  position: relative;
+  font-size: 14px;
+}
+
+.opinion_btn {
+  position: absolute;
+  right: 35px;
+  bottom: 80px;
+}
 </style>

@@ -476,7 +476,7 @@ export default {
      */
     ssQlxxchange(val) {
       this.ruleForm.ssQlxx = val;
-      this.ruleForm.qlxx.ssywh = val.ssywh;
+     this.ruleForm.qlxx.ssywh = val.ywh;
     },
     /**
      * @description: djlxchange

@@ -654,7 +654,7 @@ export default {
      */
     ssQlxxchange(val) {
       this.ruleForm.ssQlxx = val;
-      this.ruleForm.qlxx.ssywh = val.ssywh;
+      this.ruleForm.qlxx.ssywh = val.ywh;
     },
     djlxchange(val) {
       if (val == null || val == 100) {

@@ -405,7 +405,7 @@ export default {
      */
            ssQlxxchange(val) {
       this.ruleForm.ssQlxx = val;
-      this.ruleForm.qlxx.ssywh = val.ssywh;
+      this.ruleForm.qlxx.ssywh = val.ywh;
     },
     /**
      * @description: djlxchange

@@ -465,7 +465,7 @@
        */
       ssQlxxchange (val) {
         this.ruleForm.ssQlxx = val;
-        this.ruleForm.qlxx.ssywh = val.ssywh;
+        this.ruleForm.qlxx.ssywh = val.ywh;
       },
       /**
        * @description: djlxchange

@@ -367,7 +367,7 @@ export default {
      */
              ssQlxxchange(val) {
       this.ruleForm.ssQlxx = val;
-      this.ruleForm.qlxx.ssywh = val.ssywh;
+      this.ruleForm.qlxx.ssywh = val.ywh;
     },
     /**
      * @description: djlxchange

@@ -422,7 +422,7 @@ export default {
      */
          ssQlxxchange(val) {
       this.ruleForm.ssQlxx = val;
-      this.ruleForm.qlxx.ssywh = val.ssywh;
+      this.ruleForm.qlxx.ssywh = val.ywh;
     },
     /**
      * @description: djlxchange

@@ -445,7 +445,7 @@ export default {
      */
               ssQlxxchange(val) {
       this.ruleForm.ssQlxx = val;
-      this.ruleForm.qlxx.ssywh = val.ssywh;
+     this.ruleForm.qlxx.ssywh = val.ywh;
     },
     /**
      * @description: djlxchange

@@ -15,13 +15,14 @@
       placeholder="请输入终止原因"
       type="textarea"
       :rows="4"></el-input>
-    <el-button style="float: right">取消</el-button>
+    <el-button style="float: right" @click="cancelBack">取消</el-button>
     <el-button type="primary" @click="onSubmit" style="float: right">退件</el-button>
   </div>
 </template>
 
 <script>
   import { stopTask } from "@/api/workFlow.js";
+  import { popupCacel } from "@/utils/popup.js";
   export default {
     props: {
       formData: {
@@ -58,6 +59,13 @@
           }, 1000);
         });
       },
+         /**
+     * @description: closeDialog
+     * @author: renchao
+     */
+    cancelBack() {
+      popupCacel();
+    },
     },
   };
 </script>

@@ -17,16 +17,22 @@
       </el-form>
       <el-form ref="queryForm" label-width="180px" v-else>
         <el-form-item label="">
-        此环节为流程最后环节，转出后流程将结束
+          此环节为流程最后环节，转出后流程将结束
         </el-form-item>
       </el-form>
-      <div class="invalid-reson">转出原因：</div>
+      <div class="invalid-reson">审批意见：</div>
       <el-input
+        class="opinion"
         v-model="shyj"
-        placeholder="请输入转出原因"
+        placeholder="请输入审批意见"
         type="textarea"
         :rows="4"
       ></el-input>
+      <!-- <el-button
+        class="opinion_btn"
+        @click="commonOpinion"
+        >常用意见</el-button
+      > -->
       <el-button style="float: right" @click="cancelBack">取消转出</el-button>
       <el-button type="primary" @click="submitForm" style="float: right"
         >确定转出</el-button
@@ -38,36 +44,59 @@
 <script>
 import { completeTask, getNextLinkInfo } from "@/api/workFlow.js";
 import { popupCacel } from "@/utils/popup.js";
+import { mapGetters } from 'vuex'
 export default {
   components: {},
+
   props: {
     formData: {
       type: Object,
       default: {},
     },
   },
+    computed: {
+      ...mapGetters(['yjsqOptions'])
+    },
   data() {
     return {
       queryForm: {},
       shyj: "",
     };
   },
+
+   watch: {
+      // yjsqOptions: {
+      //   handler (val) {
+      //      if(val){
+      //          this.shyj = val
+      //      }
+
+      //   },
+      // },
+    },
   mounted() {
     //  this.queryForm= this.queryForm.obj
-    console.log("formDataformDataformData", this.formData);
   },
   methods: {
     /**
      * @description: submitForm
      * @author: renchao
      */
+      commonOpinion() {
+      this.$popupDialog(
+        "常用意见",
+        "workflow/components/dialog/commonOpinion",
+        {},
+        "70%",
+        true
+      );
+    },
     submitForm() {
       this.queryForm = {
         bsmSlsq: this.formData.bsmSlsq,
         shyj: this.shyj,
         stepform: JSON.stringify(this.formData.tabList),
       };
-      console.log("this.queryForm", this.queryForm);
       completeTask(this.queryForm).then((res) => {
         if (res.code === 200) {
           this.$message.success("转件成功");
@@ -77,8 +106,8 @@ export default {
           //   window.close();
           //   this.$emit("input", false);
           // }, 1000);
-            popupCacel();
-               setTimeout(() => {
+          popupCacel();
+          setTimeout(() => {
             // window.opener.location.reload(); //刷新父窗口
             if (window.opener && window.opener.getBpageList) {
               window.opener.getBpageList();
@@ -88,11 +117,12 @@ export default {
             window.close();
             this.$emit("input", false);
           }, 1000);
-        }else{
+        } else {
           this.$message.error(res.message);
         }
       });
     },
+
     /**
      * @description: closeDialog
      * @author: renchao
@@ -109,4 +139,17 @@ export default {
   margin-top: 20px;
   margin-right: 10px;
 }
+
+.opinion {
+  position: relative;
+  font-size: 14px;
+
+
+}
+
+.opinion_btn {
+  position: absolute;
+right: 35px;
+    bottom: 80px;
+}
 </style>