liuzhihui 2 vuotta sitten
vanhempi
commit
2a5379dcf1

+ 1 - 26
CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

124
         <el-row v-if="typeAlias === '2006'">
124
         <el-row v-if="typeAlias === '2006'">
125
           <el-row v-for="(item, index) in devList" :key="index">
125
           <el-row v-for="(item, index) in devList" :key="index">
126
             <el-col :span="12">
126
             <el-col :span="12">
127
-              <!-- <el-form-item prop="muterType" label="标本类型">
128
-                <el-select :disabled="butIsDisabled" placeholder="请选择" size="mini" v-model="item.muterType" @change="changeMuter">
129
-                  <el-option value="0" label="急查"></el-option>
130
-                  <el-option value="1" label="非急查"></el-option>
131
-                </el-select>
132
-              </el-form-item> -->
133
               <el-form-item prop="devname">
127
               <el-form-item prop="devname">
134
                 <el-cascader ref="cascaderbb" :options="bborderData" :props="TagProps" clearable
128
                 <el-cascader ref="cascaderbb" :options="bborderData" :props="TagProps" clearable
135
                   placeholder="请选择标本" @change="(devname)=>handleChange(devname,index)"></el-cascader>
129
                   placeholder="请选择标本" @change="(devname)=>handleChange(devname,index)"></el-cascader>
136
               </el-form-item>
130
               </el-form-item>
137
             </el-col>
131
             </el-col>
138
-            <!-- <el-col :span="8" v-if="item.muterType==0">
139
-              <el-form-item prop="devname">
140
-                <el-select :disabled="butIsDisabled" v-model="item.devname" placeholder="请选择标本">
141
-                  <el-option v-for="item in specimenArr" :key="item.F_DictionaryValueId" :label="item.F_Name"
142
-                    :value="`${item.F_Name},${item.F_DictionaryValueId}`" />
143
-                </el-select>
144
-              </el-form-item>
145
-            </el-col>
146
-            <el-col :span="8" v-if="item.muterType==1">
147
-              <el-form-item prop="devname">
148
-                <el-select :disabled="butIsDisabled" v-model="item.devname" placeholder="请选择标本">
149
-                  <el-option v-for="item in fjcspecimenArr" :key="item.F_DictionaryValueId" :label="item.F_Name"
150
-                    :value="`${item.F_Name},${item.F_DictionaryValueId}`" />
151
-                </el-select>
152
-              </el-form-item>
153
-            </el-col> -->
154
             <el-col :span="12">
132
             <el-col :span="12">
155
               <el-form-item prop="num">
133
               <el-form-item prop="num">
156
-                <el-input-number :disabled="butIsDisabled" v-model="item.num" :min="1" size="mini" />
134
+                <el-input-number :disabled="butIsDisabled" v-model="item.num" :min="1" size="medium" />
157
                 <el-button type="primary" icon="el-icon-close" circle @click="removeItem(index)" />
135
                 <el-button type="primary" icon="el-icon-close" circle @click="removeItem(index)" />
158
               </el-form-item>
136
               </el-form-item>
159
             </el-col>
137
             </el-col>
362
           name: ''
340
           name: ''
363
         },
341
         },
364
         devList: [{
342
         devList: [{
365
-          // muterType:'0',
366
           devname: '',
343
           devname: '',
367
           num: 1
344
           num: 1
368
         }],
345
         }],
455
         this.type2Arr = this.orderTypeData.type2Arr
432
         this.type2Arr = this.orderTypeData.type2Arr
456
         console.log(this.type2Arr[0])
433
         console.log(this.type2Arr[0])
457
         this.devList = [{
434
         this.devList = [{
458
-          // muterType:'0',
459
           devname: '',
435
           devname: '',
460
           num: 1
436
           num: 1
461
         }]
437
         }]
551
       },
527
       },
552
       addItem() {
528
       addItem() {
553
         const params = {
529
         const params = {
554
-          // muterType:'0',
555
           devname: '',
530
           devname: '',
556
           num: 1
531
           num: 1
557
         }
532
         }

+ 3 - 27
CallCenterWeb.UI/RMYY/src/views/systemSetup/sysSetting/muterManage/addOrEditMuter.vue

5
       <el-form-item label="父级类型">
5
       <el-form-item label="父级类型">
6
         <el-input v-model="parentText" :disabled="true" placeholder="暂无"/>
6
         <el-input v-model="parentText" :disabled="true" placeholder="暂无"/>
7
       </el-form-item>
7
       </el-form-item>
8
-      <el-form-item label="标本等级">
8
+      <el-form-item label="等级">
9
         <el-input v-model="ruleForm.F_TypeId" :disabled="true" placeholder="暂无"/>
9
         <el-input v-model="ruleForm.F_TypeId" :disabled="true" placeholder="暂无"/>
10
       </el-form-item>
10
       </el-form-item>
11
       <el-form-item label="标本名称" prop="F_Name">
11
       <el-form-item label="标本名称" prop="F_Name">
14
       <el-form-item label="标识" prop="F_Identification">
14
       <el-form-item label="标识" prop="F_Identification">
15
         <el-input v-model="ruleForm.F_Identification" placeholder="请输入标识"/>
15
         <el-input v-model="ruleForm.F_Identification" placeholder="请输入标识"/>
16
       </el-form-item>
16
       </el-form-item>
17
-     <!-- <el-form-item label="超时时限">
18
-        <el-input-number v-model="ruleForm.F_TimeOut" :precision="1" :min="0"/>
19
-      </el-form-item>
20
-      <el-form-item label="返修时限">
21
-        <el-input-number v-model="ruleForm.F_RepairTimeLimit" :precision="1" :min="0"/>
22
-      </el-form-item>
23
-      <el-form-item label="可延期次数">
24
-        <el-input-number v-model="ruleForm.F_CanReplayCount" :step="1" :min="0"/>
25
-      </el-form-item>
26
-      <el-form-item label="可催办次数">
27
-        <el-input-number v-model="ruleForm.F_CanUrgeCount" :step="1" :min="-1"/>
28
-      </el-form-item>
29
-      <el-form-item label="流转部门">
30
-        <select-dept-tree :deptparam="deptidArr" @post-deptid="getDeptid" />
31
-      </el-form-item> -->
32
       <el-form-item label="备注" prop="F_Remark">
17
       <el-form-item label="备注" prop="F_Remark">
33
         <el-input
18
         <el-input
34
           v-model="ruleForm.F_Remark"
19
           v-model="ruleForm.F_Remark"
119
     if (this.rowid) {
104
     if (this.rowid) {
120
       this.ruleForm.F_Id = this.rowid
105
       this.ruleForm.F_Id = this.rowid
121
       this.getDetail(this.rowid)
106
       this.getDetail(this.rowid)
122
-      console.log(this.parentText)
123
     }
107
     }
124
     if (this.orderGrade) {
108
     if (this.orderGrade) {
125
       this.ruleForm.F_TypeId = this.orderGrade
109
       this.ruleForm.F_TypeId = this.orderGrade
182
       getOrderType(rid).then(response => {
166
       getOrderType(rid).then(response => {
183
         if (response.state.toLowerCase() === 'success') {
167
         if (response.state.toLowerCase() === 'success') {
184
           const res = response.data
168
           const res = response.data
169
+          const parTypeText = this.$store.getters.bbxxTypeMap[parseInt(res.F_ParentID)].text
185
           this.ruleForm.F_ParentID = res.F_ParentID // 父id
170
           this.ruleForm.F_ParentID = res.F_ParentID // 父id
186
-          // this.parentText = parTypeText || '暂无'
171
+          this.parentText = parTypeText || '暂无'
187
           this.ruleForm.F_Name = res.F_Name // 角色名称
172
           this.ruleForm.F_Name = res.F_Name // 角色名称
188
           this.ruleForm.F_Remark = res.F_Remark // 角色编号
173
           this.ruleForm.F_Remark = res.F_Remark // 角色编号
189
           this.ruleForm.F_Sort = res.F_Sort // 备注
174
           this.ruleForm.F_Sort = res.F_Sort // 备注
190
           this.ruleForm.F_TypeId = res.F_TypeId
175
           this.ruleForm.F_TypeId = res.F_TypeId
191
           this.ruleForm.F_Identification = res.F_Identification
176
           this.ruleForm.F_Identification = res.F_Identification
192
-          // const parTypeText = this.$store.getters.workTypeMap[parseInt(res.fid)].text
193
-          // this.ruleForm.F_TimeOut = res.cstime
194
-          // this.ruleForm.F_RepairTimeLimit = res.fxtime
195
-          // this.ruleForm.F_AutoDept = res.autodept
196
-          // this.ruleForm.F_CanReplayCount = res.canreplaycount
197
-          // this.ruleForm.F_CanUrgeCount = res.canurgecount
198
-          // if (res.autodept) {
199
-          //   this.deptidArr = this.$store.getters.deptmap[parseInt(res.autodept)].ids
200
-          // }
201
         }
177
         }
202
       })
178
       })
203
     },
179
     },

+ 1 - 1
CallCenterWeb.UI/RMYY/src/views/systemSetup/sysSetting/muterManage/index.vue

176
           parent: this, // 当前的vue对象
176
           parent: this, // 当前的vue对象
177
           data: {
177
           data: {
178
             rowid: this.rowid,
178
             rowid: this.rowid,
179
-            parentText: this.nodeTreeText,
179
+            // parentText: this.nodeTreeText,
180
             orderGrade: this.orderGrade
180
             orderGrade: this.orderGrade
181
           } // props//该方法会自动添加一个key为layerid的值, 该值为创建层的id, 可以直接使用
181
           } // props//该方法会自动添加一个key为layerid的值, 该值为创建层的id, 可以直接使用
182
         },
182
         },

+ 10 - 0
CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/addComDispatch/addComDispatch.vue

352
 					this.valiFormData.Phone = ''
352
 					this.valiFormData.Phone = ''
353
 					this.valiFormData.Location = ''
353
 					this.valiFormData.Location = ''
354
 					this.valiFormData.ToPlace = ''
354
 					this.valiFormData.ToPlace = ''
355
+					this.getDeptLocation(e.value.split('_')[1])
355
 				}
356
 				}
356
 			},
357
 			},
358
+			//科室位置
359
+			getDeptLocation(id){
360
+				this.$http.get("Department/GetModel", {deptid:id}).then((response) => {
361
+					if (response.state.toLowerCase() === "success") {
362
+						this.valiFormData.Location = response.data.F_Location
363
+						this.valiFormData.ToPlace = response.data.F_Location
364
+					}
365
+				})
366
+			},
357
 			handleInput(res) {
367
 			handleInput(res) {
358
 				let e = this.$mHelper.getValueByText(res,this.ApplicantData)
368
 				let e = this.$mHelper.getValueByText(res,this.ApplicantData)
359
 				this.valiFormData.Applicant = e
369
 				this.valiFormData.Applicant = e

+ 10 - 0
CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/addRepair/addRepair.vue

178
 					this.valiFormData.Phone = user.usertelphone
178
 					this.valiFormData.Phone = user.usertelphone
179
 				}
179
 				}
180
 			})
180
 			})
181
+			this.getLocation(uni.getStorageSync("userCode"))
181
 			// 维修员下步流程指派的时候只能指派给自己部门
182
 			// 维修员下步流程指派的时候只能指派给自己部门
182
 			if(uni.getStorageSync("roleCode") == 'GLY' || uni.getStorageSync("roleCode") == 'WXY') {
183
 			if(uni.getStorageSync("roleCode") == 'GLY' || uni.getStorageSync("roleCode") == 'WXY') {
183
 				this.isShowIsEnd = true
184
 				this.isShowIsEnd = true
242
 					this.valiFormData.Applicant = ''
243
 					this.valiFormData.Applicant = ''
243
 					this.valiFormData.ApplicantName = ''
244
 					this.valiFormData.ApplicantName = ''
244
 					this.valiFormData.Phone = ''
245
 					this.valiFormData.Phone = ''
246
+					this.getDeptLocation(e.value.split('_')[1])
245
 				}
247
 				}
246
 			},
248
 			},
249
+			//科室位置
250
+			getDeptLocation(id){
251
+				this.$http.get("Department/GetModel", {deptid:id}).then((response) => {
252
+					if (response.state.toLowerCase() === "success") {
253
+						this.valiFormData.PlaceOfRepair = response.data.F_Location
254
+					}
255
+				})
256
+			},
247
 			//指派部门
257
 			//指派部门
248
 			maintenanceNodeclick(e) {
258
 			maintenanceNodeclick(e) {
249
 				if(e) {
259
 				if(e) {

+ 18 - 1
CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/applicantsList/addVehicle/addVehicle.vue

207
 					
207
 					
208
 				})
208
 				})
209
 			})
209
 			})
210
-			
210
+			this.getLocation(uni.getStorageSync("userCode"))
211
 			
211
 			
212
 			pageData.getCartype('CLLX', (res) => {
212
 			pageData.getCartype('CLLX', (res) => {
213
 				this.cartypeData = res
213
 				this.cartypeData = res
232
 						this.candidates = candidates
232
 						this.candidates = candidates
233
 						this.orderApplicantData = data
233
 						this.orderApplicantData = data
234
 					})
234
 					})
235
+					this.getDeptLocation(e.value.split('_')[1])
235
 				}
236
 				}
236
 			},
237
 			},
238
+			//科室位置
239
+			getDeptLocation(id){
240
+				this.$http.get("Department/GetModel", {deptid:id}).then((response) => {
241
+					if (response.state.toLowerCase() === "success") {
242
+						this.valiFormData.startplace = response.data.F_Location
243
+					}
244
+				})
245
+			},
246
+			// 地址
247
+			getLocation(user) {
248
+				this.$http.get("UserAccount/GetModel", {usercode: user}).then((response) => {
249
+					if (response.state.toLowerCase() === "success") {
250
+						this.valiFormData.startplace = response.data.F_Location
251
+					}
252
+				})
253
+			},
237
 			postSelectData(e){
254
 			postSelectData(e){
238
 				this.valiFormData.WorkOrderCategory = e
255
 				this.valiFormData.WorkOrderCategory = e
239
 			},
256
 			},