shengbingg преди 2 години
родител
ревизия
f754b2f81a
променени са 3 файла, в които са добавени 200 реда и са изтрити 12 реда
  1. 76 6
      src/pages/main/endToEnd/index.vue
  2. 62 3
      src/pages/main/integral/index.vue
  3. 62 3
      src/pages/main/outCallDemand/index.vue

+ 76 - 6
src/pages/main/endToEnd/index.vue

@@ -194,8 +194,41 @@
         </el-dialog>
 
 
-
-        <el-dialog title="选择审批人" :visible.sync="checkexa" width="50%" :destroy-on-close="true"
+        <el-dialog
+        title="选择审批人"
+        :visible.sync="checkexa"
+        width="100%"
+        style="height: 100%"
+        :fullscreen="true"
+        :destroy-on-close="true"
+        :modal-append-to-body="false"
+        :close-on-click-modal="false"
+      >
+        <div style="height: 100%">
+          <el-form :model="infolist" ref="infolist"  :rules="rules" style="height: 100%">
+            <el-form-item prop="visiblec" style="height: 100%" >
+             
+              <deptTreeOnly
+                @treeCheck="treeCheckonly"
+                :defaultList="defaultList"
+                :type="depttype"
+                :closeList="closeList"
+              ></deptTreeOnly>
+              <div style="text-align: center; margin-top: 30px">
+                <el-button type="primary" @click="checkProcessUser()"
+                  >确 定</el-button
+                >
+                <el-button @click="checkexa = false">取 消</el-button>
+                <!-- <el-button v-if="titname == '添加'" type="primary" @click="dialogCliadd">确 定</el-button>
+                    <el-button v-if="titname != '添加'" type="primary" @click="dialogCli(2)">确 定</el-button>
+                    <el-button @click="checkexa = false">取 消</el-button> -->
+              </div>
+              
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-dialog>
+        <!-- <el-dialog title="选择审批人" :visible.sync="checkexa" width="50%" :destroy-on-close="true"
             :modal-append-to-body="false" :close-on-click-modal="false">
             <div>
 
@@ -218,7 +251,7 @@
                     <el-button @click="checkexa = false">取 消</el-button>
                 </div>
             </div>
-        </el-dialog>
+        </el-dialog> -->
 
         <myMessage :messTit='messTit' @closeMessage="closeMessage" :centerDialogVisible="centerDialogVisible"
             v-if="centerDialogVisible"></myMessage>
@@ -231,7 +264,8 @@
     import toolList from '../../../components/toolList'
     import myUpload from '../../../components/upload'
     import uploadDown from '../../../components/uploadDown.vue'
-    import deptTreeOnly from "../../../components/deptTreeOnly.vue"
+    // import deptTreeOnly from "../../../components/deptTreeOnly.vue"
+    import deptTreeOnly from "../../../components/newTree.vue";
 
     export default {
         components: {
@@ -313,7 +347,7 @@
                 demandTypeopt: [],
                 carryChannelopt: [],
                 checkexa: false,
-                treeListonly: {},
+                treeListonly: [],
                 defaultList: [],
                 closeList: false,
                 depttype: 0,
@@ -362,6 +396,17 @@
             }
         },
         methods: {
+             checkProcessUser() {
+                let _this = this;
+                if (_this.treeListonly.length > 1) {
+                    _this.$message({
+                    message: "只能选择一个人",
+                    type: "error",
+                    });
+                } else {
+                    _this.dialogCliadd();
+                }
+                },
             //搜索数据
             searchInfo(v) {
                 this.params = {};
@@ -380,6 +425,25 @@
             },
             treeCheckonly(v) {
                 this.treeListonly = v;
+                console.log(v);
+                this.treeListonly.leaderAuditName = v[0].label;
+                this.treeListonly.leaderAuditNo = v[0].key;
+                // var val = {...v};
+                // console.log(val);
+                
+
+                //  let newArr=v.map(function (currentValue, index, ar) {
+                //     console.log(currentValue);//遍历打印1,2,3
+                //     // console.log(index);//遍历打印0,1,2
+                //     console.log(ar);//遍历打印三次[1, 2, 3]
+                //     // console.log(currentValue.key);
+                   
+                // //    this.treeListonly.leaderAuditName = currentValue.label;
+                // },)
+                // this.treeListonly.leaderAuditNo = newArr.currentValue.key;
+                // console.log(this.currentValue.key);
+
+
             },
             choline(v, n) {
                 if (v == 1) {
@@ -595,6 +659,7 @@
                     }
                     this.submitInfo("/bpm/api/submitTask", params);
                 } else if (v === 2) {
+                    console.log(222222)
                     let param = {
                         dealType: '0',
                         dealTypeDesc: '提交',
@@ -684,6 +749,7 @@
             },
             //添加
             dialogCliadd(v) {
+                console.log(11111)
                 let _this = this;
                 let info = {};
                 info.params = {};
@@ -710,7 +776,7 @@
                         return
                     }
                 }
-
+                console.log(123);
                 for (let i = 0; i < this.options.length; i++) {
                     if (this.terminal == this.options[i].procId) {
                         info.procName = this.options[i].procName;
@@ -782,6 +848,7 @@
                     data: {},
                 }).then((res) => {
                     this.options = res.data.data;
+                    console.log(res.data.data);
                 });
             },
             closeMessage(v) {
@@ -870,6 +937,9 @@
     }
 </script>
 <style scoped lang="scss">
+    ::v-deep .el-dialog .flex-box{
+        height: 400px;
+    }
     .onetab {
         margin-bottom: 20px;
         padding: 0 20px;

+ 62 - 3
src/pages/main/integral/index.vue

@@ -150,7 +150,43 @@
                 </div>
             </div>
         </el-dialog>
-        <el-dialog title="选择审批人" :visible.sync="checkexa" width="50%" :destroy-on-close="true"
+        <el-dialog
+        title="选择审批人"
+        :visible.sync="checkexa"
+        width="100%"
+        style="height: 100%"
+        :fullscreen="true"
+        :destroy-on-close="true"
+        :modal-append-to-body="false"
+        :close-on-click-modal="false"
+      >
+        <div style="height: 100%">
+          <el-form :model="infolist" ref="infolist" style="height: 100%">
+            <el-form-item  style="height: 100%" >
+             
+              <deptTreeOnly
+                @treeCheck="treeCheckonly"
+                :defaultList="defaultList"
+                :type="depttype"
+                :closeList="closeList"
+              ></deptTreeOnly>
+              <div style="text-align: center; margin-top: 30px">
+                <el-button type="primary" @click="checkProcessUser()"
+                  >确 定</el-button
+                >
+				<!-- <el-button type="primary" @click="dialogCliadd" v-if="!visionchonly">确 定</el-button>
+        			<el-button type="primary" @click="dialogCli(2)" v-if="visionchonly">确 定</el-button> -->
+                <el-button @click="checkexa = false">取 消</el-button>
+                <!-- <el-button type="primary" @click="dialogCliadd" v-if="vision != '审批'">确 定</el-button>
+                    <el-button type="primary" @click="dialogCli(2)" v-if="vision == '审批'">确 定</el-button>
+                <el-button @click="checkexa = false">取 消</el-button> -->
+              </div>
+             
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-dialog>
+        <!-- <el-dialog title="选择审批人" :visible.sync="checkexa" width="50%" :destroy-on-close="true"
             :modal-append-to-body="false" :close-on-click-modal="false">
             <div>
 
@@ -173,7 +209,7 @@
                     <el-button @click="checkexa = false">取 消</el-button>
                 </div>
             </div>
-        </el-dialog>
+        </el-dialog> -->
 
         <myMessage :messTit='messTit' @closeMessage="closeMessage" :centerDialogVisible="centerDialogVisible"
             v-if="centerDialogVisible"></myMessage>
@@ -186,7 +222,8 @@
     import toolList from '../../../components/toolList'
     import myUpload from '../../../components/upload'
     import uploadDown from '../../../components/uploadDown.vue'
-    import deptTreeOnly from "../../../components/deptTreeOnly.vue"
+    // import deptTreeOnly from "../../../components/deptTreeOnly.vue"
+    import deptTreeOnly from "../../../components/newTree.vue";
 
     export default {
         components: {
@@ -276,12 +313,25 @@
             }
         },
         methods: {
+            checkProcessUser() {
+                let _this = this;
+                if (_this.treeListonly.length > 1) {
+                    _this.$message({
+                    message: "只能选择一个人",
+                    type: "error",
+                    });
+                } else {
+                    _this.dialogCliadd();
+                }
+                },
             deletes() {
                 this.treeListonly = {};
                 this.closeList = !this.closeList;
             },
             treeCheckonly(v) {
                 this.treeListonly = v;
+                this.treeListonly.leaderAuditName = v[0].label;
+                this.treeListonly.leaderAuditNo = v[0].key;
             },
             choline(v, n) {
                 if (v == 1) {
@@ -670,6 +720,15 @@
     }
 </script>
 <style scoped lang="scss">
+    ::v-deep .el-dialog__body {
+        max-height: calc(100vh - 70px) !important;
+        min-height: 100px;
+        height: 100%;
+        overflow-y: hidden;
+        }
+    ::v-deep .el-dialog .flex-box{
+        height: 400px;
+    }
     .onetab {
         margin-bottom: 20px;
         padding: 0 20px;

+ 62 - 3
src/pages/main/outCallDemand/index.vue

@@ -230,7 +230,49 @@
 				</div>
 			</div>
 		</el-dialog>
-        <el-dialog title="选择审批人" :visible.sync="checkexa" width="50%" :destroy-on-close="true"
+		 <el-dialog
+        title="选择审批人"
+        :visible.sync="checkexa"
+        width="100%"
+        style="height: 100%"
+        :fullscreen="true"
+        :destroy-on-close="true"
+        :modal-append-to-body="false"
+        :close-on-click-modal="false"
+      >
+        <div style="height: 100%">
+          <el-form :model="infolist" ref="infolist" style="height: 100%">
+            <el-form-item prop="visiblec" style="height: 100%">
+              <!-- <span style="width: 80px">审批人员</span> -->
+              <deptTreeOnly
+                @treeCheck="treeCheckonly"
+                :defaultList="defaultList"
+                :type="depttype"
+                :closeList="closeList"
+              ></deptTreeOnly>
+              <div style="text-align: center; margin-top: 30px">
+                <el-button type="primary" @click="checkProcessUser()"
+                  >确 定</el-button
+                >
+				<!-- <el-button type="primary" @click="dialogCliadd" v-if="!visionchonly">确 定</el-button>
+        			<el-button type="primary" @click="dialogCli(2)" v-if="visionchonly">确 定</el-button> -->
+                <el-button @click="checkexa = false">取 消</el-button>
+              </div>
+              <!-- <div class="tree treeUser">
+                <p>
+                  {{ treeListonly.leaderAuditName }}
+                  <i
+                    v-if="treeListonly.leaderAuditName"
+                    @click="treeDelete()"
+                    class="el-icon-error"
+                  ></i>
+                </p>
+              </div> -->
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-dialog>
+        <!-- <el-dialog title="选择审批人" :visible.sync="checkexa" width="50%" :destroy-on-close="true"
         	:modal-append-to-body="false" :close-on-click-modal="false">
         	<div>
 
@@ -254,7 +296,7 @@
         			<el-button @click="checkexa = false">取 消</el-button>
         		</div>
         	</div>
-        </el-dialog>
+        </el-dialog> -->
 
 	</fullscreen>
 
@@ -265,7 +307,8 @@
 	import toolList from '../../../components/toolList'
 	import myUpload from '../../../components/upload'
 	import uploadDown from '../../../components/uploadDown.vue'
-    import deptTreeOnly from "../../../components/deptTreeOnly.vue"
+    // import deptTreeOnly from "../../../components/deptTreeOnly.vue"
+	import deptTreeOnly from "../../../components/newTree.vue";
 
 	export default {
 		components: {
@@ -532,12 +575,25 @@
 			}
 		},
 		methods: {
+			checkProcessUser() {
+                let _this = this;
+                if (_this.treeListonly.length > 1) {
+                    _this.$message({
+                    message: "只能选择一个人",
+                    type: "error",
+                    });
+                } else {
+                    _this.dialogCliadd();
+                }
+                },
             deletes() {
             	this.treeListonly = {};
             	this.closeList = !this.closeList;
             },
             treeCheckonly(v) {
             	this.treeListonly = v;
+				this.treeListonly.leaderAuditName = v[0].label;
+				this.treeListonly.leaderAuditNo = v[0].key;
             },
 			closedia() {
 				this.infolist = {
@@ -937,6 +993,9 @@
 	}
 </script>
 <style scoped lang="scss">
+	::v-deep .el-dialog .flex-box{
+        height: 400px;
+    }
 	.onetab {
 		margin-bottom: 20px;
 		padding: 0 20px;