1

CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

@@ -124,36 +124,14 @@
         <el-row v-if="typeAlias === '2006'">
           <el-row v-for="(item, index) in devList" :key="index">
             <el-col :span="12">
-              <!-- <el-form-item prop="muterType" label="标本类型">
-                <el-select :disabled="butIsDisabled" placeholder="请选择" size="mini" v-model="item.muterType" @change="changeMuter">
-                  <el-option value="0" label="急查"></el-option>
-                  <el-option value="1" label="非急查"></el-option>
-                </el-select>
-              </el-form-item> -->
               <el-form-item prop="devname">
                 <el-cascader ref="cascaderbb" :options="bborderData" :props="TagProps" clearable
                   placeholder="请选择标本" @change="(devname)=>handleChange(devname,index)"></el-cascader>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="8" v-if="item.muterType==0">
-              <el-form-item prop="devname">
-                <el-select :disabled="butIsDisabled" v-model="item.devname" placeholder="请选择标本">
-                  <el-option v-for="item in specimenArr" :key="item.F_DictionaryValueId" :label="item.F_Name"
-                    :value="`${item.F_Name},${item.F_DictionaryValueId}`" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="item.muterType==1">
-              <el-form-item prop="devname">
-                <el-select :disabled="butIsDisabled" v-model="item.devname" placeholder="请选择标本">
-                  <el-option v-for="item in fjcspecimenArr" :key="item.F_DictionaryValueId" :label="item.F_Name"
-                    :value="`${item.F_Name},${item.F_DictionaryValueId}`" />
-                </el-select>
-              </el-form-item>
-            </el-col> -->
             <el-col :span="12">
               <el-form-item prop="num">
-                <el-input-number :disabled="butIsDisabled" v-model="item.num" :min="1" size="mini" />
+                <el-input-number :disabled="butIsDisabled" v-model="item.num" :min="1" size="medium" />
                 <el-button type="primary" icon="el-icon-close" circle @click="removeItem(index)" />
               </el-form-item>
             </el-col>
@@ -362,7 +340,6 @@
           name: ''
         },
         devList: [{
-          // muterType:'0',
           devname: '',
           num: 1
         }],
@@ -455,7 +432,6 @@
         this.type2Arr = this.orderTypeData.type2Arr
         console.log(this.type2Arr[0])
         this.devList = [{
-          // muterType:'0',
           devname: '',
           num: 1
         }]
@@ -551,7 +527,6 @@
       },
       addItem() {
         const params = {
-          // muterType:'0',
           devname: '',
           num: 1
         }

CallCenterWeb.UI/RMYY/src/views/systemSetup/sysSetting/muterManage/addOrEditMuter.vue

@@ -5,7 +5,7 @@
       <el-form-item label="父级类型">
         <el-input v-model="parentText" :disabled="true" placeholder="暂无"/>
       </el-form-item>
-      <el-form-item label="标本等级">
+      <el-form-item label="等级">
         <el-input v-model="ruleForm.F_TypeId" :disabled="true" placeholder="暂无"/>
       </el-form-item>
       <el-form-item label="标本名称" prop="F_Name">
@@ -14,21 +14,6 @@
       <el-form-item label="标识" prop="F_Identification">
         <el-input v-model="ruleForm.F_Identification" placeholder="请输入标识"/>
       </el-form-item>
-     <!-- <el-form-item label="超时时限">
-        <el-input-number v-model="ruleForm.F_TimeOut" :precision="1" :min="0"/>
-      </el-form-item>
-      <el-form-item label="返修时限">
-        <el-input-number v-model="ruleForm.F_RepairTimeLimit" :precision="1" :min="0"/>
-      </el-form-item>
-      <el-form-item label="可延期次数">
-        <el-input-number v-model="ruleForm.F_CanReplayCount" :step="1" :min="0"/>
-      </el-form-item>
-      <el-form-item label="可催办次数">
-        <el-input-number v-model="ruleForm.F_CanUrgeCount" :step="1" :min="-1"/>
-      </el-form-item>
-      <el-form-item label="流转部门">
-        <select-dept-tree :deptparam="deptidArr" @post-deptid="getDeptid" />
-      </el-form-item> -->
       <el-form-item label="备注" prop="F_Remark">
         <el-input
           v-model="ruleForm.F_Remark"
@@ -119,7 +104,6 @@ export default {
     if (this.rowid) {
       this.ruleForm.F_Id = this.rowid
       this.getDetail(this.rowid)
-      console.log(this.parentText)
     }
     if (this.orderGrade) {
       this.ruleForm.F_TypeId = this.orderGrade
@@ -182,22 +166,14 @@ export default {
       getOrderType(rid).then(response => {
         if (response.state.toLowerCase() === 'success') {
           const res = response.data
+          const parTypeText = this.$store.getters.bbxxTypeMap[parseInt(res.F_ParentID)].text
           this.ruleForm.F_ParentID = res.F_ParentID // 父id
-          // this.parentText = parTypeText || '暂无'
+          this.parentText = parTypeText || '暂无'
           this.ruleForm.F_Name = res.F_Name // 角色名称
           this.ruleForm.F_Remark = res.F_Remark // 角色编号
           this.ruleForm.F_Sort = res.F_Sort // 备注
           this.ruleForm.F_TypeId = res.F_TypeId
           this.ruleForm.F_Identification = res.F_Identification
-          // const parTypeText = this.$store.getters.workTypeMap[parseInt(res.fid)].text
-          // this.ruleForm.F_TimeOut = res.cstime
-          // this.ruleForm.F_RepairTimeLimit = res.fxtime
-          // this.ruleForm.F_AutoDept = res.autodept
-          // this.ruleForm.F_CanReplayCount = res.canreplaycount
-          // this.ruleForm.F_CanUrgeCount = res.canurgecount
-          // if (res.autodept) {
-          //   this.deptidArr = this.$store.getters.deptmap[parseInt(res.autodept)].ids
-          // }
         }
       })
     },

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

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

CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/addComDispatch/addComDispatch.vue

@@ -352,8 +352,18 @@
 					this.valiFormData.Phone = ''
 					this.valiFormData.Location = ''
 					this.valiFormData.ToPlace = ''
+					this.getDeptLocation(e.value.split('_')[1])
 				}
 			},
+			//科室位置
+			getDeptLocation(id){
+				this.$http.get("Department/GetModel", {deptid:id}).then((response) => {
+					if (response.state.toLowerCase() === "success") {
+						this.valiFormData.Location = response.data.F_Location
+						this.valiFormData.ToPlace = response.data.F_Location
+					}
+				})
+			},
 			handleInput(res) {
 				let e = this.$mHelper.getValueByText(res,this.ApplicantData)
 				this.valiFormData.Applicant = e

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/addRepair/addRepair.vue

@@ -178,6 +178,7 @@
 					this.valiFormData.Phone = user.usertelphone
 				}
 			})
+			this.getLocation(uni.getStorageSync("userCode"))
 			// 维修员下步流程指派的时候只能指派给自己部门
 			if(uni.getStorageSync("roleCode") == 'GLY' || uni.getStorageSync("roleCode") == 'WXY') {
 				this.isShowIsEnd = true
@@ -242,8 +243,17 @@
 					this.valiFormData.Applicant = ''
 					this.valiFormData.ApplicantName = ''
 					this.valiFormData.Phone = ''
+					this.getDeptLocation(e.value.split('_')[1])
 				}
 			},
+			//科室位置
+			getDeptLocation(id){
+				this.$http.get("Department/GetModel", {deptid:id}).then((response) => {
+					if (response.state.toLowerCase() === "success") {
+						this.valiFormData.PlaceOfRepair = response.data.F_Location
+					}
+				})
+			},
 			//指派部门
 			maintenanceNodeclick(e) {
 				if(e) {

CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/applicantsList/addVehicle/addVehicle.vue

@@ -207,7 +207,7 @@
 					
 				})
 			})
-			
+			this.getLocation(uni.getStorageSync("userCode"))
 			
 			pageData.getCartype('CLLX', (res) => {
 				this.cartypeData = res
@@ -232,8 +232,25 @@
 						this.candidates = candidates
 						this.orderApplicantData = data
 					})
+					this.getDeptLocation(e.value.split('_')[1])
 				}
 			},
+			//科室位置
+			getDeptLocation(id){
+				this.$http.get("Department/GetModel", {deptid:id}).then((response) => {
+					if (response.state.toLowerCase() === "success") {
+						this.valiFormData.startplace = response.data.F_Location
+					}
+				})
+			},
+			// 地址
+			getLocation(user) {
+				this.$http.get("UserAccount/GetModel", {usercode: user}).then((response) => {
+					if (response.state.toLowerCase() === "success") {
+						this.valiFormData.startplace = response.data.F_Location
+					}
+				})
+			},
 			postSelectData(e){
 				this.valiFormData.WorkOrderCategory = e
 			},