liuzhihui 2 years ago
parent
commit
7792639ec5

+ 28 - 6
CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

@@ -165,7 +165,7 @@
165 165
           <el-row v-for="(item, index) in devList" :key="index">
166 166
             <el-col :span="7">
167 167
               <el-form-item prop="F_ToDept">
168
-                <el-cascader ref="cascaderdept" :options="deptorderData" :props="DeptTagProps" clearable
168
+                <el-cascader ref="cascaderdept" v-model="item.F_ToDept" :options="deptorderData" :props="DeptTagProps" clearable
169 169
                   placeholder="请选择科室" @change="(F_ToDept)=>handleDeptChange(F_ToDept,index)"></el-cascader>
170 170
               </el-form-item>
171 171
             </el-col>
@@ -1116,11 +1116,33 @@
1116 1116
                     this.$parent.$layer.closeAll()
1117 1117
                     // this.$parent.$layer.close(this.layerid)
1118 1118
                     // this.$parent.getList() // 重新加载父级数据
1119
-                    this.$refs.ruleForm.resetFields()
1120
-                    this.$message.success('恭喜你,添加成功!')
1121
-                    this.$emit('orderTypeData',this.orderTypeData)
1122
-                    this.fileList = []
1123
-                    this.ruleForm.repairImageid = ''
1119
+                    // this.$refs.ruleForm.resetFields()
1120
+                    // this.$message.success('恭喜你,添加成功!')
1121
+                    // this.fileList = []
1122
+                    // this.ruleForm.repairImageid = ''
1123
+                    if(window.location.href.indexOf('addWorkOrder')>=0){
1124
+                      this.$alert('工单已提交成功', '提示:', {
1125
+                        confirmButtonText: '确定',
1126
+                        showClose:false,
1127
+                        callback: action => {
1128
+                          this.$refs.ruleForm.resetFields()
1129
+                          this.fileList = []
1130
+                          this.ruleForm.repairImageid = ''
1131
+                          this.devList = [{
1132
+                            devname: '',
1133
+                            num: 1,
1134
+                            F_IsBorrow: '',
1135
+                            F_ToDept:''
1136
+                          }]
1137
+                        }
1138
+                      });
1139
+                    }else{
1140
+                      this.$message({
1141
+                        message: '恭喜你,添加工单成功!',
1142
+                        type: 'success',
1143
+                        duration: 1000
1144
+                      })
1145
+                    }
1124 1146
                     // this.$emit('order-type-data',{
1125 1147
                     //   F_Type1: 2000,
1126 1148
                     //   F_Type2: '',

+ 18 - 18
CallCenterWeb.UI/RMYY/src/components/workOrder/information/addOrEditInfOrder.vue

@@ -520,16 +520,16 @@ export default {
520 520
         }
521 521
       }
522 522
       if (this.worktypeInfo3 === "ywzx_jy") {
523
-        this.zpdptname = "建议科室";
524
-        this.zppername = "建议人";
523
+        this.zpdptname = "建议科室";
524
+        this.zppername = "建议人";
525 525
       }
526 526
       if (this.worktypeInfo3 === "ywzx_ts") {
527
-        this.zpdptname = "投诉科室";
528
-        this.zppername = "投诉人";
527
+        this.zpdptname = "投诉科室";
528
+        this.zppername = "投诉人";
529 529
       }
530 530
       if (this.worktypeInfo3 === "ywzx_by") {
531
-        this.zpdptname = "表扬科室";
532
-        this.zppername = "表扬人";
531
+        this.zpdptname = "表扬科室";
532
+        this.zppername = "表扬人";
533 533
       }
534 534
       if (this.ruleForm.F_Type2) {
535 535
         this.getAuto()
@@ -696,16 +696,16 @@ export default {
696 696
       const twoTypeInfo = this.$store.getters.workTypeMap[parseInt(id)];
697 697
       if (twoTypeInfo && twoTypeInfo.tag) {
698 698
         if (twoTypeInfo.tag === "ywzx_jy") {
699
-          this.zpdptname = "建议科室";
700
-          this.zppername = "建议人";
699
+          this.zpdptname = "建议科室";
700
+          this.zppername = "建议人";
701 701
         }
702 702
         if (twoTypeInfo.tag === "ywzx_ts") {
703
-          this.zpdptname = "投诉科室";
704
-          this.zppername = "投诉人";
703
+          this.zpdptname = "投诉科室";
704
+          this.zppername = "投诉人";
705 705
         }
706 706
         if (twoTypeInfo.tag === "ywzx_by") {
707
-          this.zpdptname = "表扬科室";
708
-          this.zppername = "表扬人";
707
+          this.zpdptname = "表扬科室";
708
+          this.zppername = "表扬人";
709 709
         }
710 710
       }
711 711
     },
@@ -728,16 +728,16 @@ export default {
728 728
               this.worktypeInfo3 =
729 729
                 this.$store.getters.workTypeMap[parseInt(res.F_type2)].tag;
730 730
               if (this.worktypeInfo3 === "ywzx_jy") {
731
-                this.zpdptname = "建议科室";
732
-                this.zppername = "建议人";
731
+                this.zpdptname = "建议科室";
732
+                this.zppername = "建议人";
733 733
               }
734 734
               if (this.worktypeInfo3 === "ywzx_ts") {
735
-                this.zpdptname = "投诉科室";
736
-                this.zppername = "投诉人";
735
+                this.zpdptname = "投诉科室";
736
+                this.zppername = "投诉人";
737 737
               }
738 738
               if (this.worktypeInfo3 === "ywzx_by") {
739
-                this.zpdptname = "表扬科室";
740
-                this.zppername = "表扬人";
739
+                this.zpdptname = "表扬科室";
740
+                this.zppername = "表扬人";
741 741
               }
742 742
               this.rowid = res.F_ID;
743 743
               this.ruleForm.F_ID = res.F_ID;

+ 34 - 17
CallCenterWeb.UI/RMYY/src/components/workOrder/repairbase/addRepairbase.vue

@@ -87,7 +87,7 @@
87 87
         </el-row>
88 88
         <el-row>
89 89
           <el-col :span="12">
90
-            <el-form-item label="紧急情况">
90
+            <el-form-item label="紧急情况" prop="EmergencyTypes">
91 91
               <el-radio-group v-model="ruleForm.EmergencyTypes">
92 92
                 <el-radio label="一般">一般</el-radio>
93 93
                 <el-radio label="紧急">紧急</el-radio>
@@ -118,8 +118,9 @@
118 118
       <el-table-column prop="StateName" label="工单状态" align="center" min-width />
119 119
       <el-table-column prop="F_CreateTime" label="创建时间" align="center" min-width />
120 120
     </el-table>
121
-    <pagination v-if="isAddorder==true" v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex"
122
-      :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" />
121
+    <pagination v-if="isAddorder==true" v-show="pageParams.total > 0" :total="pageParams.total"
122
+      :pageindex.sync="pageParams.pageindex" :pagesize.sync="pageParams.pagesize" class="pagination"
123
+      @pagination="getList" />
123 124
   </div>
124 125
 </template>
125 126
 
@@ -191,7 +192,7 @@
191 192
     },
192 193
     data() {
193 194
       return {
194
-        isAddorder:false,
195
+        isAddorder: false,
195 196
         pageParams: {
196 197
           pageindex: 1, // 当前第几页
197 198
           pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
@@ -356,9 +357,9 @@
356 357
       ])
357 358
     },
358 359
     created() {
359
-      if(window.location.href.indexOf('addWorkOrder')>=0){
360
+      if (window.location.href.indexOf('addWorkOrder') >= 0) {
360 361
         this.isAddorder = true
361
-      }else{
362
+      } else {
362 363
         this.isAddorder = false
363 364
       }
364 365
       this.cid = this.callid
@@ -398,7 +399,7 @@
398 399
             this.getClassUserArr(autoData[i].autodept)
399 400
             this.ruleForm.assignMant = autoData[i].autousercode
400 401
             return;
401
-          } else if (autoData[i].autoyq == '0' && applyHos =='0') { //全部
402
+          } else if (autoData[i].autoyq == '0' && applyHos == '0') { //全部
402 403
             this.assignArr = this.$store.getters.deptmap[parseInt(autoData[i].autodept)].ids
403 404
             this.ruleForm.assignDepart = autoData[i].autodept
404 405
             this.getClassUserArr(autoData[i].autodept)
@@ -433,6 +434,7 @@
433 434
         this.getRepairman(this.ruleForm.repairDeptid, 0)
434 435
         this.getDeptAddress(data[data.length - 1])
435 436
         this.getAuto()
437
+        this.getList()
436 438
       },
437 439
       geAssigntDeptid(data) {
438 440
         this.ruleForm.assignDepart = data[data.length - 1]
@@ -601,7 +603,7 @@
601 603
       },
602 604
       submitForm(formName) {
603 605
         if (this.telTopRightState == '通话中') {
604
-          if(window.location.href.indexOf('callScreen') >= 0){
606
+          if (window.location.href.indexOf('callScreen') >= 0) {
605 607
             this.$message('请挂断后再提交工单')
606 608
             return;
607 609
           }
@@ -628,7 +630,6 @@
628 630
               if (valid) {
629 631
                 if (this.wid) {
630 632
                   // 编辑
631
-                  console.log('bj')
632 633
                   if (this.ruleForm.F_Type2) {
633 634
                     this.ruleForm.repairOrderType = this.ruleForm.F_Type2
634 635
                   }
@@ -663,7 +664,6 @@
663 664
                   })
664 665
                 }
665 666
                 if (this.wid === '') {
666
-                  console.log('tj')
667 667
                   const params = {
668 668
                     LeaveRecordId: this.fid,
669 669
                     CallId: this.cid,
@@ -684,15 +684,31 @@
684 684
                   getAddRepairbase(params).then((res) => {
685 685
                     if (res.state.toLowerCase() === 'success') {
686 686
                       this.getUrl()
687
-                      this.$refs.ruleForm.resetFields()
687
+                      this.$parent.$layer.closeAll()
688
+                      // this.$refs.ruleForm.resetFields()
688 689
                       // this.deptidArr = []
689 690
                       // this.assignArr = []
690 691
                       // this.usercodeSearch = ''
691
-                      this.$message({
692
-                        message: '恭喜你,添加工单成功!',
693
-                        type: 'success',
694
-                        duration: 1000
695
-                      })
692
+                      if(window.location.href.indexOf('addWorkOrder')>=0){
693
+                        this.$alert('工单已提交成功', '提示:', {
694
+                          confirmButtonText: '确定',
695
+                          showClose:false,
696
+                          callback: action => {
697
+                            this.$refs.ruleForm.resetFields()
698
+                            this.fileList = []
699
+                            this.ruleForm.repairImageid = ''
700
+                          }
701
+                        });
702
+                      }else{
703
+                        this.$message({
704
+                          message: '恭喜你,添加工单成功!',
705
+                          type: 'success',
706
+                          duration: 1000
707
+                        })
708
+                      }
709
+                      this.getList()
710
+                      // this.fileList = []
711
+                      // this.ruleForm.repairImageid = ''
696 712
                       // window.location.reload()
697 713
                     }
698 714
                   })
@@ -739,8 +755,9 @@
739 755
       getList() {
740 756
         return new Promise((resolve) => {
741 757
           const params = {
742
-            time:1,
758
+            time: 1,
743 759
             loweltype: this.orderTypeData.F_Type2,
760
+            deptid: this.ruleForm.repairDeptid,
744 761
             pageindex: this.pageParams.pageindex, // int 第几页
745 762
             pagesize: this.pageParams.pagesize, // int 每页几条信息
746 763
           };

+ 22 - 6
CallCenterWeb.UI/RMYY/src/components/workOrder/vehicleDispatch/addOrEdit.vue

@@ -457,12 +457,28 @@
457 457
                     this.$parent.$layer.closeAll()
458 458
                     // this.$parent.$layer.close(this.layerid)
459 459
                     // this.$parent.$parent.getList() // 重新加载父级数据
460
-                    this.$refs.ruleForm.resetFields()
461
-                    this.$message({
462
-                      message: '恭喜你,添加工单成功!',
463
-                      type: 'success',
464
-                      duration: 1000
465
-                    })
460
+                    // this.$refs.ruleForm.resetFields()
461
+                    // this.$message({
462
+                    //   message: '恭喜你,添加工单成功!',
463
+                    //   type: 'success',
464
+                    //   duration: 1000
465
+                    // })
466
+                    if(window.location.href.indexOf('addWorkOrder')>=0){
467
+                      this.$alert('工单已提交成功', '提示:', {
468
+                        confirmButtonText: '确定',
469
+                        showClose:false,
470
+                        callback: action => {
471
+                          this.$refs.ruleForm.resetFields()
472
+                        }
473
+                      });
474
+                    }else{
475
+                      this.$message({
476
+                        message: '恭喜你,添加工单成功!',
477
+                        type: 'success',
478
+                        duration: 1000
479
+                      })
480
+                    }
481
+
466 482
                     // window.location.reload()
467 483
                     // this.usercodeSearch = ''
468 484
                     // this.deptid = []

+ 6 - 6
CallCenterWeb.UI/RMYY/src/views/orderManage/components/askdetail.vue

@@ -87,31 +87,31 @@
87 87
                 <td>
88 88
                   {{ orderDetailData.SourceName || "-" }}
89 89
                 </td> -->
90
-                <th>投诉科室:</th>
90
+                <th>投诉科室:</th>
91 91
                 <td>
92 92
                   {{ orderDetailData.ComplaintDept || "-" }}
93 93
                 </td>
94
-                <th>投诉人:</th>
94
+                <th>投诉人:</th>
95 95
                 <td>
96 96
                   {{ orderDetailData.ComplaintUser || "-" }}
97 97
                 </td>
98 98
               </tr>
99 99
               <tr v-show="isJY">
100
-                <th>建议科室:</th>
100
+                <th>建议科室:</th>
101 101
                 <td colspan="3">
102 102
                   {{ orderDetailData.ComplaintDept || "-" }}
103 103
                 </td>
104
-                <th>建议人:</th>
104
+                <th>建议人:</th>
105 105
                 <td>
106 106
                   {{ orderDetailData.ComplaintUser || "-" }}
107 107
                 </td>
108 108
               </tr>
109 109
               <tr v-show="isBY">
110
-                <th>表扬科室:</th>
110
+                <th>表扬科室:</th>
111 111
                 <td colspan="3">
112 112
                   {{ orderDetailData.ComplaintDept || "-" }}
113 113
                 </td>
114
-                <th>表扬人:</th>
114
+                <th>表扬人:</th>
115 115
                 <td>
116 116
                   {{ orderDetailData.ComplaintUser || "-" }}
117 117
                 </td>

+ 4 - 4
CallCenterWeb.UI/RMYYAPP/config/index.config.js

@@ -3,8 +3,8 @@ const CONFIG = {
3 3
     development: {
4 4
         assetsPath: '/static', // 静态资源路径
5 5
 				// baseUrl: 'http://192.168.8.10:8033/',
6
-				// baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址
7
-				baseUrl: 'http://39.164.159.192:8000/', // 本地外网地址s
6
+				baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址
7
+				// baseUrl: 'http://39.164.159.192:8000/', // 本地外网地址s
8 8
 		// baseUrl: 'http://172.16.10.22:8000/',	
9 9
         hostUrl: '', // H5地址(前端运行地址)
10 10
         weixinAppId: '' // 微信公众号appid
@@ -14,8 +14,8 @@ const CONFIG = {
14 14
     production: {
15 15
         assetsPath: '/static', // 静态资源路径
16 16
 				// baseUrl: 'http://192.168.8.10:8033/',
17
-				baseUrl: 'http://39.164.159.192:8000/',
18
-				// baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址
17
+				// baseUrl: 'http://39.164.159.192:8000/',
18
+				baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址
19 19
 		// baseUrl: 'http://172.16.10.22:8000/',		
20 20
         hostUrl: '', // H5地址(前端运行地址)
21 21
         weixinAppId: '' // 微信公众号appid

+ 2 - 2
CallCenterWeb.UI/RMYYAPP/manifest.json

@@ -2,8 +2,8 @@
2 2
     "name" : "郑州人民医院综合服务保障调度平台",
3 3
     "appid" : "__UNI__5A5207D",
4 4
     "description" : "",
5
-    "versionName" : "1.2.10",
6
-    "versionCode" : 1209,
5
+    "versionName" : "1.2.12",
6
+    "versionCode" : 1211,
7 7
     "transformPx" : false,
8 8
     /* 5+App特有相关 */
9 9
     "app-plus" : {

+ 145 - 21
CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/addRepair/addRepair.vue

@@ -59,6 +59,48 @@
59 59
 			<view class="btnClass">
60 60
 				<button type="primary" :disabled="disabledButton" @click="submit('valiForm')">提交工单</button>
61 61
 			</view>
62
+			<view style="margin-top: 20px;">
63
+				<!-- 基于 uni-list 的页面布局 -->
64
+				<uni-section title="历史工单" type="line">
65
+							<uni-list>
66
+								<!-- <uni-list-item title="列表文字" />
67
+								<uni-list-item title="列表文字" rightText="右侧文字" />
68
+								<uni-list-item title="列表文字" note="列表描述信息" rightText="右侧文字" /> -->
69
+								<uni-list-item v-for="(item, index) in listData" :key="index" :title="item.F_WoCode" :to="'/pages/myTask/workOrderDetail/workOrderDetail?wid='+item.F_WoCode">
70
+									<template v-slot:body>
71
+										<view class="uni-list-box">
72
+											<view class="uni-content">
73
+												<view class="uni-note">工单编号:{{item.F_WoCode}}</view>
74
+												<view class="uni-note" v-show="item.F_ProposerDept">
75
+													上报科室:{{ $mHelper.findParents(departList,item.F_ProposerDept)}}
76
+												</view>
77
+												<view class="uni-note">上报时间:{{item.F_CreateTime}}</view>
78
+												<view class="uni-note">工单状态:{{item.StateName}}</view>
79
+											</view>
80
+										</view>
81
+									</template>
82
+								</uni-list-item>
83
+							</uni-list>
84
+						</uni-section>
85
+				<!-- <uni-list :border="true">
86
+					<uni-list-item title="历史工单"></uni-list-item>
87
+					<uni-list-item class="tableList" direction="column" v-for="(item, index) in listData" :key="index"
88
+						:to="'/pages/myTask/workOrderDetail/workOrderDetail?wid='+item.F_WoCode">
89
+						<template v-slot:body>
90
+							<view class="uni-list-box">
91
+								<view class="uni-content">
92
+									<view class="uni-note">工单编号:{{item.F_WoCode}}</view>
93
+									<view class="uni-note" v-show="item.F_ProposerDept">
94
+										上报科室:{{ $mHelper.findParents(departList,item.F_ProposerDept)}}
95
+									</view>
96
+									<view class="uni-note">上报时间:{{item.F_CreateTime}}</view>
97
+									<view class="uni-note">工单状态:{{item.StateName}}</view>
98
+								</view>
99
+							</view>
100
+						</template>
101
+					</uni-list-item>
102
+				</uni-list> -->
103
+			</view>
62 104
 		</view>
63 105
 	</view>
64 106
 </template>
@@ -79,6 +121,7 @@
79 121
 		},
80 122
 		data() {
81 123
 			return {
124
+				listData: [],
82 125
 				getFontSizeValue: '1rem',
83 126
 				showsb: false,
84 127
 				showSearch: true,
@@ -128,8 +171,8 @@
128 171
 				departList: [],
129 172
 				candidates: [],
130 173
 				candidatesDesignate: [],
131
-				hosptalList:[],
132
-				auto:[],
174
+				hosptalList: [],
175
+				auto: [],
133 176
 				// 校验规则
134 177
 				rules: {
135 178
 					WorkOrderCategory: {
@@ -204,7 +247,8 @@
204 247
 						this.ApplicantData = res
205 248
 						this.orderApplicantData = data
206 249
 						this.valiFormData.Applicant = uni.getStorageSync("userCode")
207
-						this.valiFormData.ApplicantName = this.$mHelper.findUserName(this.ApplicantData, uni.getStorageSync("userCode"))
250
+						this.valiFormData.ApplicantName = this.$mHelper.findUserName(this.ApplicantData, uni
251
+							.getStorageSync("userCode"))
208 252
 						const user = this.orderApplicantData.find((o) => {
209 253
 							return o.usercode === this.valiFormData.Applicant.toString()
210 254
 						})
@@ -236,14 +280,28 @@
236 280
 			}
237 281
 		},
238 282
 		methods: {
283
+			getOldList() {
284
+				const params = {
285
+					pageindex: 1,
286
+					pagesise: 10000,
287
+					time: 1,
288
+					loweltype: this.valiFormData.WorkOrderCategory,
289
+					deptid: this.valiFormData.ApplicationDept.split('_')[1]				
290
+				}
291
+				this.$http.get("WorkCommon/GetComList", params).then((res) => {
292
+					if (res.state.toLowerCase() === "success") {
293
+						this.listData = res.rows
294
+					}
295
+				})
296
+			},
239 297
 			// 获取院区数据
240 298
 			getHosptallist() {
241 299
 				const params = {
242 300
 					pageindex: 1,
243 301
 					pagesise: 10000
244 302
 				}
245
-				this.$http.get("Worepair/GetListyqRepairlist",params).then((res)=>{
246
-					if(res.state.toLowerCase() ==="success"){
303
+				this.$http.get("Worepair/GetListyqRepairlist", params).then((res) => {
304
+					if (res.state.toLowerCase() === "success") {
247 305
 						this.hosptalList = res.rows
248 306
 					}
249 307
 				})
@@ -252,7 +310,7 @@
252 310
 			getHosptalId(name) {
253 311
 				let id = 0;
254 312
 				this.hosptalList.forEach(v => {
255
-					if(v.T_Woname == name){
313
+					if (v.T_Woname == name) {
256 314
 						id = v.T_Woid
257 315
 					}
258 316
 				})
@@ -276,11 +334,12 @@
276 334
 					this.orderInf = inf
277 335
 				}
278 336
 				this.valiFormData.WorkOrderCategory = e
337
+				this.getOldList()
279 338
 				// if(this.auto){					
280 339
 				//     this.getAuto()
281 340
 				// }
282 341
 			},
283
-			getAuto(){
342
+			getAuto() {
284 343
 				//清空
285 344
 				this.valiFormData.MaintenanceDept = ''
286 345
 				this.candidatesDesignate = []
@@ -288,27 +347,30 @@
288 347
 				this.valiFormData.Maintenancer = ''
289 348
 				this.valiFormData.MaintenancerName = ''
290 349
 				//申请人院区
291
-				const applyHos = this.getHosptalId(this.$mHelper.findParents(this.departList,this.valiFormData.ApplicationDept.split('_')[1]).split('/')[0])
292
-				console.log(applyHos,'院区')
293
-				if(applyHos == 0){
350
+				const applyHos = this.getHosptalId(this.$mHelper.findParents(this.departList, this.valiFormData
351
+					.ApplicationDept.split('_')[1]).split('/')[0])
352
+				console.log(applyHos, '院区')
353
+				if (applyHos == 0) {
294 354
 					return
295 355
 				}
296 356
 				//遍历
297 357
 				for (var i = 0; i < this.auto.length; i++) {
298 358
 					if (this.auto[i].autoyq == applyHos) {
299 359
 						var aotocode = this.auto[i].autousercode
300
-						this.valiFormData.MaintenanceDept = this.$mHelper.findParents(this.departList, this.auto[i].autodept)
360
+						this.valiFormData.MaintenanceDept = this.$mHelper.findParents(this.departList, this.auto[i]
361
+								.autodept)
301 362
 							.split('/').length + '_' + this.auto[i].autodept
302 363
 						pageData.getApplicant(this.auto[i].autodept, (res, data, candidates) => {
303 364
 							this.candidatesDesignate = candidates
304 365
 							this.MaintenancerData = res
305
-						    this.valiFormData.MaintenancerName = this.getTextByCode(aotocode)
306
-						    this.valiFormData.Maintenancer = aotocode
307
-						})				
366
+							this.valiFormData.MaintenancerName = this.getTextByCode(aotocode)
367
+							this.valiFormData.Maintenancer = aotocode
368
+						})
308 369
 						return
309
-					} else if (this.auto[i].autoyq == '0' && applyHos =='0') {
370
+					} else if (this.auto[i].autoyq == '0' && applyHos == '0') {
310 371
 						var aotocode = this.auto[i].autousercode
311
-						this.valiFormData.MaintenanceDept = this.$mHelper.findParents(this.departList, this.auto[i].autodept)
372
+						this.valiFormData.MaintenanceDept = this.$mHelper.findParents(this.departList, this.auto[i]
373
+								.autodept)
312 374
 							.split('/').length + '_' + this.auto[i].autodept
313 375
 						pageData.getApplicant(this.auto[i].autodept, (res, data, candidates) => {
314 376
 							this.candidatesDesignate = candidates
@@ -316,20 +378,20 @@
316 378
 							this.valiFormData.MaintenancerName = this.getTextByCode(aotocode)
317 379
 							this.valiFormData.Maintenancer = aotocode
318 380
 						})
319
-				
381
+
320 382
 					}
321 383
 				}
322 384
 			},
323
-			getTextByCode(code){
324
-				for(var i = 0;i<this.MaintenancerData.length;i++){
325
-					if(this.MaintenancerData[i].value == code){
385
+			getTextByCode(code) {
386
+				for (var i = 0; i < this.MaintenancerData.length; i++) {
387
+					if (this.MaintenancerData[i].value == code) {
326 388
 						return this.MaintenancerData[i].text
327 389
 					}
328 390
 				}
329 391
 			},
330 392
 			// 申请部门
331 393
 			deptNodeclick(e) {
332
-				if (e) {					
394
+				if (e) {
333 395
 					console.log(e)
334 396
 					this.valiFormData.ApplicationDept = e.value
335 397
 					pageData.getApplicant(e.value.split('_')[1], (res, data, candidates) => {
@@ -342,6 +404,7 @@
342 404
 					this.valiFormData.ApplicantName = ''
343 405
 					this.valiFormData.Phone = ''
344 406
 					this.getDeptLocation(e.value.split('_')[1])
407
+					this.getOldList()
345 408
 					// this.getAuto()
346 409
 				}
347 410
 			},
@@ -510,11 +573,72 @@
510 573
 <style lang="scss" scoped>
511 574
 	@import '@/common/addFormDeep.scss';
512 575
 
576
+	page {
577
+		// display: flex;
578
+		// flex-direction: column;
579
+		// box-sizing: border-box;
580
+		background-color: #efeff4;
581
+		// min-height: 100%;
582
+		// height: auto;
583
+	}
584
+
585
+	/deep/ .uni-title-sub {
586
+		font-size: 1rem;
587
+	}
588
+
589
+	/deep/ .uni-note {
590
+		font-size: 1rem;
591
+	}
592
+
593
+	.oldtitle {
594
+		text-align: center;
595
+		margin: 20px 0 10px 0;
596
+		background-color: #aaaaaa;
597
+		padding: 10px 0;
598
+		border-radius: 5px;
599
+	}
600
+
601
+	.uni-list-box {
602
+		position: relative;
603
+		padding: 10px;
604
+		border-bottom: 1px solid #DCDFE6;
605
+		// .textState {
606
+		// 	position: absolute;
607
+		// 	right: -5px;
608
+		// 	bottom: 0px;
609
+		// 	font-size: 1rem;
610
+		// 	background: #ffffff;
611
+		// 	border: 1px solid #52C41A;
612
+		// 	padding: 2px 5px;
613
+		// 	color: #52C41A;
614
+		// 	// background-color: rgba(195, 239, 161, 0.2);
615
+		// 	border-radius: 5px
616
+		// }
617
+	}
618
+
513 619
 	.wrapper {
514 620
 		padding: 10px 15px;
515 621
 		background-color: #fff;
516 622
 
517 623
 		.form {}
518 624
 
625
+		.tableWrapper {
626
+			margin: 0px 0 0 0;
627
+
628
+			.tableList {
629
+				color: #b6b6b6;
630
+				// background-color: #ececec;
631
+				margin-bottom: 10px;
632
+				padding-bottom: 10px;
633
+
634
+				.textLeft {
635
+					width: 300px;
636
+					white-space: nowrap;
637
+					overflow: hidden;
638
+					text-overflow: ellipsis;
639
+				}
640
+			}
641
+		}
642
+
519 643
 	}
520 644
 </style>

+ 2 - 0
CallCenterWeb.UI/RMYYAPP/uni_modules/uni-section/changelog.md

@@ -0,0 +1,2 @@
1
+## 0.0.1(2022-07-22)
2
+- 初始化

+ 167 - 0
CallCenterWeb.UI/RMYYAPP/uni_modules/uni-section/components/uni-section/uni-section.vue

@@ -0,0 +1,167 @@
1
+<template>
2
+	<view class="uni-section">
3
+		<view class="uni-section-header" @click="onClick">
4
+				<view class="uni-section-header__decoration" v-if="type" :class="type" />
5
+        <slot v-else name="decoration"></slot>
6
+
7
+        <view class="uni-section-header__content">
8
+          <text :style="{'font-size':titleFontSize,'color':titleColor}" class="uni-section__content-title" :class="{'distraction':!subTitle}">{{ title }}</text>
9
+          <text v-if="subTitle" :style="{'font-size':subTitleFontSize,'color':subTitleColor}" class="uni-section-header__content-sub">{{ subTitle }}</text>
10
+        </view>
11
+
12
+        <view class="uni-section-header__slot-right">
13
+          <slot name="right"></slot>
14
+        </view>
15
+		</view>
16
+
17
+		<view class="uni-section-content" :style="{padding: _padding}">
18
+			<slot />
19
+		</view>
20
+	</view>
21
+</template>
22
+
23
+<script>
24
+
25
+	/**
26
+	 * Section 标题栏
27
+	 * @description 标题栏
28
+	 * @property {String} type = [line|circle|square] 标题装饰类型
29
+	 * 	@value line 竖线
30
+	 * 	@value circle 圆形
31
+	 * 	@value square 正方形
32
+	 * @property {String} title 主标题
33
+	 * @property {String} titleFontSize 主标题字体大小
34
+	 * @property {String} titleColor 主标题字体颜色
35
+	 * @property {String} subTitle 副标题
36
+	 * @property {String} subTitleFontSize 副标题字体大小
37
+	 * @property {String} subTitleColor 副标题字体颜色
38
+	 * @property {String} padding 默认插槽 padding
39
+	 */
40
+
41
+	export default {
42
+		name: 'UniSection',
43
+    emits:['click'],
44
+		props: {
45
+			type: {
46
+				type: String,
47
+				default: ''
48
+			},
49
+			title: {
50
+				type: String,
51
+				required: true,
52
+				default: ''
53
+			},
54
+      titleFontSize: {
55
+        type: String,
56
+        default: '14px'
57
+      },
58
+			titleColor:{
59
+				type: String,
60
+				default: '#333'
61
+			},
62
+			subTitle: {
63
+				type: String,
64
+				default: ''
65
+			},
66
+      subTitleFontSize: {
67
+        type: String,
68
+        default: '12px'
69
+      },
70
+      subTitleColor: {
71
+        type: String,
72
+        default: '#999'
73
+      },
74
+			padding: {
75
+				type: [Boolean, String],
76
+				default: false
77
+			}
78
+		},
79
+    computed:{
80
+      _padding(){
81
+        if(typeof this.padding === 'string'){
82
+          return this.padding
83
+        }
84
+
85
+        return this.padding?'10px':''
86
+      }
87
+    },
88
+		watch: {
89
+			title(newVal) {
90
+				if (uni.report && newVal !== '') {
91
+					uni.report('title', newVal)
92
+				}
93
+			}
94
+		},
95
+    methods: {
96
+			onClick() {
97
+				this.$emit('click')
98
+			}
99
+		}
100
+	}
101
+</script>
102
+<style lang="scss" >
103
+	$uni-primary: #2979ff !default;
104
+
105
+	.uni-section {
106
+		background-color: #fff;
107
+    .uni-section-header {
108
+      position: relative;
109
+      /* #ifndef APP-NVUE */
110
+      display: flex;
111
+      /* #endif */
112
+      flex-direction: row;
113
+      align-items: center;
114
+      padding: 12px 10px;
115
+      font-weight: normal;
116
+
117
+      &__decoration{
118
+        margin-right: 6px;
119
+        background-color: $uni-primary;
120
+        &.line {
121
+          width: 4px;
122
+          height: 12px;
123
+          border-radius: 10px;
124
+        }
125
+
126
+        &.circle {
127
+          width: 8px;
128
+          height: 8px;
129
+          border-top-right-radius: 50px;
130
+          border-top-left-radius: 50px;
131
+          border-bottom-left-radius: 50px;
132
+          border-bottom-right-radius: 50px;
133
+        }
134
+
135
+        &.square {
136
+          width: 8px;
137
+          height: 8px;
138
+        }
139
+      }
140
+
141
+      &__content {
142
+        /* #ifndef APP-NVUE */
143
+        display: flex;
144
+        /* #endif */
145
+        flex-direction: column;
146
+        flex: 1;
147
+        color: #333;
148
+
149
+        .distraction {
150
+          flex-direction: row;
151
+          align-items: center;
152
+        }
153
+        &-sub {
154
+          margin-top: 2px;
155
+        }
156
+      }
157
+
158
+      &__slot-right{
159
+        font-size: 14px;
160
+      }
161
+    }
162
+
163
+    .uni-section-content{
164
+      font-size: 14px;
165
+    }
166
+	}
167
+</style>

+ 87 - 0
CallCenterWeb.UI/RMYYAPP/uni_modules/uni-section/package.json

@@ -0,0 +1,87 @@
1
+{
2
+  "id": "uni-section",
3
+  "displayName": "uni-section 标题栏",
4
+  "version": "0.0.1",
5
+  "description": "标题栏组件",
6
+  "keywords": [
7
+    "uni-ui",
8
+    "uniui",
9
+    "标题栏"
10
+],
11
+  "repository": "https://github.com/dcloudio/uni-ui",
12
+  "engines": {
13
+    "HBuilderX": ""
14
+  },
15
+  "directories": {
16
+    "example": "../../temps/example_temps"
17
+  },
18
+  "dcloudext": {
19
+    "category": [
20
+      "前端组件",
21
+      "通用组件"
22
+    ],
23
+    "sale": {
24
+      "regular": {
25
+        "price": "0.00"
26
+      },
27
+      "sourcecode": {
28
+        "price": "0.00"
29
+      }
30
+    },
31
+    "contact": {
32
+      "qq": ""
33
+    },
34
+    "declaration": {
35
+      "ads": "无",
36
+      "data": "无",
37
+      "permissions": "无"
38
+    },
39
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
40
+  },
41
+  "uni_modules": {
42
+    "dependencies": [
43
+      "uni-scss"
44
+    ],
45
+    "encrypt": [],
46
+    "platforms": {
47
+      "cloud": {
48
+        "tcb": "y",
49
+        "aliyun": "y"
50
+      },
51
+      "client": {
52
+        "App": {
53
+          "app-vue": "y",
54
+          "app-nvue": "y"
55
+        },
56
+        "H5-mobile": {
57
+          "Safari": "y",
58
+          "Android Browser": "y",
59
+          "微信浏览器(Android)": "y",
60
+          "QQ浏览器(Android)": "y"
61
+        },
62
+        "H5-pc": {
63
+          "Chrome": "y",
64
+          "IE": "y",
65
+          "Edge": "y",
66
+          "Firefox": "y",
67
+          "Safari": "y"
68
+        },
69
+        "小程序": {
70
+          "微信": "y",
71
+          "阿里": "y",
72
+          "百度": "y",
73
+          "字节跳动": "y",
74
+          "QQ": "y"
75
+        },
76
+        "快应用": {
77
+          "华为": "u",
78
+          "联盟": "u"
79
+        },
80
+        "Vue": {
81
+            "vue2": "y",
82
+            "vue3": "y"
83
+        }
84
+      }
85
+    }
86
+  }
87
+}

+ 8 - 0
CallCenterWeb.UI/RMYYAPP/uni_modules/uni-section/readme.md

@@ -0,0 +1,8 @@
1
+## Section 标题栏
2
+> **组件名:uni-section**
3
+> 代码块: `uSection`
4
+
5
+uni-section 组件主要用于文章、列表详情等标题展示
6
+
7
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-section)
8
+#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839

BIN
CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/__UNI__5A5207D_cm.apk


+ 1 - 1
CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/apkurl

@@ -1 +1 @@
1
-https://ide.dcloud.net.cn/build/download/cb963680-cc4a-11ed-bc15-a95c148c36b3
1
+https://ide.dcloud.net.cn/build/download/a78f18e0-cdf8-11ed-bea1-7bf3a9e9307e

File diff suppressed because it is too large
+ 1 - 1
CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/cmManifestCache.json


File diff suppressed because it is too large
+ 5 - 5
CallCenterWeb.UI/RMYYAPP/unpackage/cache/wgt/__UNI__5A5207D/app-service.js


File diff suppressed because it is too large
+ 1 - 1
CallCenterWeb.UI/RMYYAPP/unpackage/cache/wgt/__UNI__5A5207D/app-view.js


File diff suppressed because it is too large
+ 1 - 1
CallCenterWeb.UI/RMYYAPP/unpackage/cache/wgt/__UNI__5A5207D/manifest.json