Merge branch 'dev'

@@ -15,57 +15,57 @@
       <el-form :model="form" v-show="n == 0" label-width="135px" ref="ruleForm">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="申请分类" v-if="form.ywDetail && form.ywDetail.sqfl">
-              <el-select v-model="form.ywDetail.sqfl" disabled placeholder="请选择" class="width100">
+            <el-form-item label="申请分类" v-if="form.sqdjyw">
+              <el-select v-model="form.sqdjyw.sqfl" disabled placeholder="请选择" class="width100">
                 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="登记业务编码" v-if="form.ywDetail && form.ywDetail.djywbm">
-              <el-input v-model="form.ywDetail.djywbm" disabled></el-input>
+            <el-form-item label="登记业务编码" v-if="form.sqdjyw">
+              <el-input v-model="form.sqdjyw.djywbm" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="登记业务名称" v-if="form.ywDetail && form.ywDetail.djywmc">
-              <el-input v-model="form.ywDetail.djywmc" disabled></el-input>
+            <el-form-item label="登记业务名称" v-if="form.sqdjyw">
+              <el-input v-model="form.sqdjyw.djywmc" disabled></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="发起业务单元类型" v-if="form.ywDetail && form.ywDetail.fqywdylx">
-              <el-select v-model="form.ywDetail.fqywdylx" disabled placeholder="请选择" class="width100">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
+            <el-form-item label="发起业务单元类型" v-if="form.sqdjyw">
+              <el-select v-model="form.sqdjyw.sqywdylx" disabled placeholder="请选择" class="width100">
+                 <el-option v-for="item in sqywdylx" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                  </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="是否启用" prop="enabled">
-              <el-radio-group v-model="form.ywDetail.enabled">
+            <el-form-item label="是否启用" prop="enabled" v-if="form.sqdjyw">
+              <el-radio-group v-model="form.sqdjyw.enabled">
                 <el-radio label="1">启用</el-radio>
                 <el-radio label="0">禁用</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="业务流程ID" prop="flowid">
-              <el-input v-model="form.ywDetail.flowid"></el-input>
+            <el-form-item label="业务流程ID" prop="flowid" v-if="form.sqdjyw">
+              <el-input v-model="form.sqdjyw.flowid"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="流程参数" prop="flowparams">
-              <el-input v-model="form.ywDetail.flowparams"></el-input>
+          <el-col :span="24">
+            <el-form-item label="流程参数" prop="flowparams" v-if="form.sqdjyw">
+              <el-input v-model="form.sqdjyw.flowparams"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
           <el-col :span="8">
-            <el-form-item label="登记原因设置" prop="sfqydjyymb">
-              <el-radio-group v-model="form.ywDetail.sfqydjyymb">
+            <el-form-item label="登记原因设置" prop="sfqydjyymb" v-if="form.sqdjyw">
+              <el-radio-group v-model="form.sqdjyw.sfqydjyymb">
                 <el-radio label="1">启用</el-radio>
                 <el-radio label="0">禁用</el-radio>
               </el-radio-group>
@@ -73,7 +73,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="登记情形及材料">
-              <el-input v-model="form.ywDetail.djqxcl" placeholder="仅支持execl文件导入"></el-input>
+              <el-input v-model="form.fileUrl" placeholder="仅支持execl文件导入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="1">
@@ -85,8 +85,8 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="登记原因模板" prop="djyy">
-              <el-input type="textarea" :rows="4" placeholder="请输入内容" v-model="form.ywDetail.djyy">
+            <el-form-item label="登记原因模板" prop="djyy" v-if="form.sqdjyw">
+              <el-input type="textarea" :rows="4" placeholder="请输入内容" v-model="form.sqdjyw.djyy">
               </el-input>
             </el-form-item>
           </el-col>
@@ -102,7 +102,7 @@
             :pagination="false" :data="form.clxx">
           </lb-table>
         </el-collapse-item>
-        <el-collapse-item title="刷选权利设置" name="3" v-if="form.ywDetail.sfsxql == '1'">
+        <el-collapse-item title="刷选权利设置" name="3" v-if="form.sqdjyw && form.sqdjyw.sfsxql == '1'">
           <div class="dyztsd-title">
             <b>请勾选需要查询的权利信息</b>
             <div>
@@ -143,6 +143,7 @@
   import { upward, down } from "@/utils/operation";
   import { getDjlxInfo, getSqdjywDetail, saveSqdjyw } from "@/api/sysSqdjyw.js";
   import { datas, sendThis } from "./sqywDetail";
+  import store from '@/store/index.js'
   export default {
     name: "componentDialog",
     props: {
@@ -151,21 +152,27 @@
         default: () => { }
       }
     },
+   
     data () {
       return {
         key: 0,
         tn: 0,
         n: 0,
         djlxList: [],
-        options: [],
+        sqywdylx:store.getters.dictData['sqywdylx'],
+        options: [
+          {label:"正常申请",value:"1"},
+          {label:"一并申请",value:"2"},
+          {label:"补录申请",value:"3"}
+          ],
         imgUploadUrl: uploadUrl(),
         title: "",
         activeName: "1",
         form: {
-          bsmSqyw: '',
-          ywDetail: {},
-          djqx: [],
-          clxx: []
+          // bsmSqyw: '',
+          // ywDetail: {},
+          // djqx: [],
+          // clxx: []
         },
         djqxCol: datas.djqxCol(),
         clxxCol: datas.clxxCol(),
@@ -248,13 +255,16 @@
         let _this = this
         getSqdjywDetail(bsmSqyw).then((res) => {
           if (res.code === 200) {
-            _this.form.bsmSqyw = res.result.bsmSqyw
-            _this.form.ywDetail = res.result.ywDetail
-            _this.$set(_this.form, 'djqx', res.result.djqx)
-            _this.$set(_this.form, 'sxql', res.result.sxql)
-            _this.$set(_this.form, 'clxx', res.result.clxx)
-            _this.$set(_this.form, 'sxzt', res.result.sxzt)
-            _this.$set(_this.form, 'ywDetail', res.result.ywDetail)
+             _this.form=res.result;
+            // _this.form.bsmSqyw = res.result.bsmSqyw;
+            // _this.form.ywDetail = res.result.ywDetail;
+            // _this.$set(_this.form, 'djqx', res.result.djqx);
+            // _this.$set(_this.form, 'sxql', res.result.sxql);
+            // _this.$set(_this.form, 'clxx', res.result.clxx);
+            // _this.$set(_this.form, 'sxzt', res.result.sxzt);
+            // _this.$set(_this.form, 'ywDetail', res.result.ywDetail);
+            // _this.$set(_this.form, 'sqdjyw', res.result.sqdjyw);
+            // _this.$set(_this.form, 'parentRule', res.result.parentRule);
           } else {
             this.$alert(res.message)
           }

@@ -61,11 +61,11 @@ class data extends filter {
 
       },
       {
-        prop: "czsj",
+        prop: "updatetime",
         label: "最近操作时间"
       },
       {
-        prop: "czr",
+        prop: "updater",
         label: "最近操作人"
       },
 

@@ -94,10 +94,6 @@
           data: [],
         },
         bdcdysz: [],
-        bsmSqyw:
-          this.sqywInfo.nodetype === "djlx"
-            ? this.sqywInfo.bsmSqyw
-            : this.sqywInfo.parentid,
       };
     },
     mounted () {
@@ -131,12 +127,8 @@
         if (!this.isJump) {
           this.loading = true
           startBusinessFlow({
-            bsmSqyw: this.bsmSqyw,
+            bsmSqyw: this.sqywInfo.bsmSqyw,
             bdcdysz: this.bdcdysz,
-            djqxbm:
-              this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-            djqxmc:
-              this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
           }).then((res) => {
             this.loading = false
             if (res.code == 200) {

@@ -96,6 +96,7 @@
        * @author: renchao
        */
       queryClick () {
+        console.log("sdfsdf");
         this.$startLoading();
         this.queryForm.sqywbm = this.sqywInfo.djywbm;
         selectDiyaq({ ...this.queryForm, ...this.pageData }).then((res) => {
@@ -116,12 +117,12 @@
           this.$message.error("请至少选择一条数据");
           return;
         }
-        this.loading = true
+        this.loading = true;        
         startBusinessFlow({
-          bsmSqyw: this.sqywInfo.parentid,
+          bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
-          djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-          djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
+          // djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
+          // djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
         }).then((res) => {
           this.loading = false
           if (res.code == 200) {

@@ -168,10 +168,6 @@
           data: [],
         },
         bdcdysz: [],
-        bsmSqyw:
-          this.sqywInfo.nodetype === "djlx"
-            ? this.sqywInfo.bsmSqyw
-            : this.sqywInfo.parentid,
       };
     },
     mounted () {
@@ -243,12 +239,10 @@
         if (!this.isJump) {
           this.loading = true
           startBusinessFlow({
-            bsmSqyw: this.bsmSqyw,
+            bsmSqyw: this.sqywInfo.bsmSqyw,
             //sjlx: 'zrz',
             sjlx: this.activeName,
             bdcdysz: this.bdcdysz,
-            djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-            djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
           }).then((res) => {
             this.loading = false
             if (res.code == 200) {

@@ -70,10 +70,6 @@
           data: [],
         },
         bdcdysz: [],
-        bsmSqyw:
-          this.sqywInfo.nodetype === "djlx"
-            ? this.sqywInfo.bsmSqyw
-            : this.sqywInfo.parentid,
       };
     },
     mounted () {
@@ -107,10 +103,8 @@
         }
         this.loading = true
         startBusinessFlow({
-          bsmSqyw: this.bsmSqyw,
+          bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
-          djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-          djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
         }).then((res) => {
           this.loading = false
           if (res.code == 200) {

@@ -104,10 +104,8 @@
         }
         this.loading = true
         startBusinessFlow({
-          bsmSqyw: this.sqywInfo.parentid,
+          bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
-          djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-          djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
         }).then((res) => {
           this.loading = false
           if (res.code == 200) {

@@ -85,11 +85,7 @@
           columns: datas.columns(),
           data: [],
         },
-        bdcdysz: [],
-        bsmSqyw:
-          this.sqywInfo.nodetype === "djlx"
-            ? this.sqywInfo.bsmSqyw
-            : this.sqywInfo.parentid,
+        bdcdysz: [],       
       };
     },
     mounted () {
@@ -111,7 +107,7 @@
        */
       queryClick () {
         this.$startLoading();
-        this.queryForm.bsmSqyw = this.bsmSqyw;
+        this.queryForm.bsmSqyw = this.sqywInfo.bsmSqyw;
         selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
           this.$endLoading();
           if (res.code === 200) {
@@ -132,10 +128,8 @@
         }
         this.loading = true
         startBusinessFlow({
-          bsmSqyw: this.bsmSqyw,
+          bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
-          djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-          djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
         }).then((res) => {
           this.loading = false
           if (res.code == 200) {

@@ -111,8 +111,6 @@
         startBusinessFlow({
           bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
-          djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-          djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
         }).then((res) => {
           this.loading = false
           if (res.code == 200) {

@@ -110,8 +110,6 @@
         startBusinessFlow({
           bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
-          djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-          djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
         }).then((res) => {
           this.loading = false
           if (res.code == 200) {

@@ -117,10 +117,8 @@
         }
         this.loading = true
         startBusinessFlow({
-          bsmSqyw: this.sqywInfo.parentid,
+          bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
-          djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-          djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
         }).then((res) => {
           this.loading = false
           if (res.code == 200) {

@@ -237,10 +237,8 @@
       submitForm () {
         this.loading = true
         startBusinessFlow({
-          bsmSqyw: this.sqywInfo.parentid,
+          bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
-          djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-          djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
         }).then((res) => {
           this.loading = false
           if (res.code == 200) {

@@ -76,10 +76,6 @@
           data: [],
         },
         bdcdysz: [],
-        bsmSqyw:
-          this.sqywInfo.nodetype === "djlx"
-            ? this.sqywInfo.bsmSqyw
-            : this.sqywInfo.parentid,
       };
     },
     mounted () {
@@ -114,10 +110,8 @@
         }
         this.loading = true
         startBusinessFlow({
-          bsmSqyw: this.bsmSqyw,
+          bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
-          djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-          djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
         }).then((res) => {
           this.loading = false
           if (res.code == 200) {

@@ -76,10 +76,6 @@
           data: [],
         },
         bdcdysz: [],
-        bsmSqyw:
-          this.sqywInfo.nodetype === "djlx"
-            ? this.sqywInfo.bsmSqyw
-            : this.sqywInfo.parentid,
       };
     },
     mounted () {

@@ -76,10 +76,6 @@
           data: [],
         },
         bdcdysz: [],
-        bsmSqyw:
-          this.sqywInfo.nodetype === "djlx"
-            ? this.sqywInfo.bsmSqyw
-            : this.sqywInfo.parentid,
       };
     },
     mounted () {
@@ -114,10 +110,8 @@
         }
         this.loading = true
         startBusinessFlow({
-          bsmSqyw: this.bsmSqyw,
+          bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
-          djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-          djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
         }).then((res) => {
           this.loading = false
           if (res.code == 200) {

@@ -117,10 +117,8 @@
         }
         this.loading = true
         startBusinessFlow({
-          bsmSqyw: this.sqywInfo.parentid,
+          bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
-          djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-          djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
         }).then((res) => {
           this.loading = false
           if (res.code == 200) {

@@ -110,8 +110,6 @@
         startTogetherFlow({
           bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
-          djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-          djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
         }).then((res) => {
           this.loading = false
           if (res.code == 200) {

@@ -109,8 +109,6 @@
         startTogetherFlow({
           bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
-          djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-          djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
         }).then((res) => {
           if (res.code == 200) {
             this.$message({

@@ -109,9 +109,7 @@
         this.loading = true
         startTogetherFlow({
           bsmSqyw: this.sqywInfo.bsmSqyw,
-          bdcdysz: this.bdcdysz,
-          djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-          djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
+          bdcdysz: this.bdcdysz
         }).then((res) => {
           this.loading = false
           if (res.code == 200) {

@@ -110,8 +110,6 @@
         startBusinessFlow({
           bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
-          djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-          djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
         }).then((res) => {
           this.loading = false
           if (res.code == 200) {

@@ -111,8 +111,6 @@
         startBusinessFlow({
           bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
-          djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-          djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
         }).then((res) => {
           this.loading = false
           if (res.code == 200) {

@@ -112,8 +112,6 @@
         startBusinessFlow({
           bsmSqyw: this.sqywInfo.bsmSqyw,
           bdcdysz: this.bdcdysz,
-          djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-          djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
         }).then((res) => {
           this.loading = false
           if (res.code == 200) {

@@ -369,7 +369,12 @@
        * @author: renchao
        */
       openDialog () {
-        let title = "申请业务：" + this.selectParam?.djywmc ? this.selectParam?.djywmc : '';
+        let title = this.selectParam.djywmc;
+        if(this.selectParam.nodetype=="djqx"){
+          title+="（"+this.selectParam.nodename+"）";
+        }
+        //let title = "申请业务：";
+        //console.log(title);
         this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'sqywInfo': this.selectParam }, "90%", true)
       },
       /**

@@ -37,8 +37,7 @@
        * @param {*} view
        * @author: renchao
        */
-      loadView (view) {
-        console.log(view, 'view');
+      loadView (view) {        
         return (r) =>
           require.ensure([], () => r(require(`./components/${view}.vue`)));
       },