2.7.3

CallCenterWeb.UI/RMYY/src/components/button/orderList.vue

@@ -94,7 +94,7 @@
         </el-form-item>
         <el-row>
           <el-form-item label="维修人" prop="tousercode">
-            <el-select v-model="transferForm.tousercode" filterable placeholder="请选择维修人" style="width: 68%"
+            <el-select v-model="transferForm.tousercode" clearable filterable placeholder="请选择维修人" style="width: 68%"
               @change="changeRepairman">
               <el-option v-for="item in repairman" :key="item.usercode" :label="item.username+'('+item.count+')'"
                 :value="item.usercode" />
@@ -116,7 +116,7 @@
         </el-form-item>
         <el-row>
           <el-form-item label="指派人">
-            <el-select v-model="zhddtransferForm.DealMan" filterable placeholder="请选择指派人" style="width: 68%"
+            <el-select v-model="zhddtransferForm.DealMan" clearable filterable placeholder="请选择指派人" style="width: 68%"
               @change="changezhddRepairman">
               <el-option v-for="item in zhddrepairman" :key="item.usercode" :label="item.username+'('+item.count+')'"
                 :value="item.usercode" />
@@ -411,7 +411,7 @@
         </el-form-item>
         <el-row>
           <el-form-item label="指派人">
-            <el-select v-model="dispatchtransferForm.DealMan" filterable placeholder="请选择指派人" style="width: 68%"
+            <el-select v-model="dispatchtransferForm.DealMan" clearable filterable placeholder="请选择指派人" style="width: 68%"
               @change="changedispatchRepairman">
               <el-option v-for="item in dispatchrepairman" :key="item.usercode" :label="item.username+'('+item.count+')'"
                 :value="item.usercode" />

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

@@ -575,11 +575,11 @@
           const data = res.data
           this.ruleForm.ApplicationDept = data.F_DeptId
           this.deptidArr = this.$store.getters.deptmap[parseInt(data.F_DeptId)].ids
-          this.getAuto()
           this.getRepairman(data.F_DeptId, 0)
           this.ruleForm.Applicant = data.F_UserCode
           this.ruleForm.phone = data.F_Telephone
           this.ruleForm.position = data.F_Location
+          this.getAuto()
           // this.ruleForm.toplace = data.F_Location
         })      
       },

CallCenterWeb.UI/RMYY/src/components/workOrder/repairbase/addRepairbase.vue

@@ -232,11 +232,11 @@
             message: '请输入报修内容',
             trigger: 'blur'
           }],
-          F_DeviceEncode: [{
-            required: true,
-            message: '请输入设备资产编码',
-            trigger: 'blur'
-          }],
+          // F_DeviceEncode: [{
+          //   required: true,
+          //   message: '请输入设备资产编码',
+          //   trigger: 'blur'
+          // }],
           repairAddress: [{
             required: true,
             message: '请输入报修地点',
@@ -371,12 +371,12 @@
           const data = res.data
           this.ruleForm.repairDeptid = data.F_DeptId
           this.deptidArr = this.$store.getters.deptmap[parseInt(data.F_DeptId)].ids
-          this.getAuto()
           this.getRepairman(data.F_DeptId, 0)
           this.ruleForm.repairmanid = data.F_UserCode
           this.ruleForm.repairmanphone = data.F_Telephone
           this.ruleForm.repairmanCallNumber = data.F_Telephone
           this.ruleForm.repairAddress = data.F_Location
+          this.getAuto()
         })
       },
       // 部门

CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/addRepairbase/index.vue

@@ -200,11 +200,11 @@
             message: '请输入报修地点',
             trigger: 'blur'
           }],
-          F_DeviceEncode: [{
-            required: true,
-            message: '请输入设备资产编码',
-            trigger: 'blur'
-          }]
+          // F_DeviceEncode: [{
+          //   required: true,
+          //   message: '请输入设备资产编码',
+          //   trigger: 'blur'
+          // }]
         }
       }
     },

CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/repairList/index.vue

@@ -798,7 +798,7 @@
             <el-radio label="0">否</el-radio>
             <el-radio label="1">是</el-radio>
           </el-radio-group>
-          <el-select
+          <!-- <el-select
             v-if="doneForm.IsInvolvedEquip == '1'"
             filterable
             v-model="equilist"
@@ -816,6 +816,26 @@
               :label="item.F_EquipName + '(' + item.F_EquipNumber + ')'"
               :value="item.F_EquipID"
             />
+          </el-select> -->
+        </el-form-item>
+        <el-form-item v-if="doneForm.IsInvolvedEquip == '1'" label="耗材信息">
+          <el-select
+            filterable
+            v-model="equilist"
+            placeholder="请选择耗材"
+            size="medium"
+            multiple
+            collapse-tags
+            clearable
+            style="width: 100%"
+            @change="equiChange"
+          >
+            <el-option
+              v-for="(item, index) in equiArr"
+              :key="index"
+              :label="item.F_EquipName + '(' + item.F_EquipNumber + ')'"
+              :value="item.F_EquipID"
+            />
           </el-select>
         </el-form-item>
         <el-form-item v-if="doneForm.type == '0' && equilist.length > 0">

CallCenterWeb.UI/RMYY/src/views/orderManage/components/orderDetail.vue

@@ -65,7 +65,7 @@
               </tr>
               <tr>
                 <th>挂起时间:</th>
-                <td>{{ orderDetailData.F_ExceptFinishTime }}</td>
+                <td colspan="5">{{ orderDetailData.F_ExceptFinishTime }}</td>
               </tr>
               <tr v-if="shebeibm == true">
                 <th>设备资产编码:</th>

CallCenterWeb.UI/RMYYAPP/pages/components/orderSelect/orderSelect.vue

@@ -60,14 +60,15 @@
 				this.identification = this.$mHelper.getIdentification(this.orderList,data.value)
 				// console.log(this.identification )
 				// console.log(data, 'data')
-				this.$http.get("GongDanType/GetModule", {mId:data.value}).then((response) => {
-					if (response.state.toLowerCase() === "success") {
-						if(response.data.autodept!=''){
-							this.autoData = JSON.parse(response.data.autodept)
-				            this.$emit('post-select-data',data.value,data.id,data.orderType,this.identification, data.text,this.autoData)
-						}
-					}
-				})
+				this.$emit('post-select-data',data.value,data.id,data.orderType,this.identification, data.text)
+				// this.$http.get("GongDanType/GetModule", {mId:data.value}).then((response) => {
+				// 	if (response.state.toLowerCase() === "success") {
+				// 		if(response.data.autodept!=''){
+				// 			this.autoData = JSON.parse(response.data.autodept)
+				//             this.$emit('post-select-data',data.value,data.id,data.orderType,identification, data.text,this.autoData)
+				// 		}
+				// 	}
+				// })
 			},
 			popupclosed() {
 				this.WorkOrderCategory = this.order

CallCenterWeb.UI/RMYYAPP/pages/login/login.vue

@@ -116,9 +116,6 @@
 			},
 			saveDept(){
 				pageData.getDet((res, data) => {
-					// this.departList = data
-					// this.deptDataTree = res
-					// this.assignedDepartData = res
 					window.localStorage.setItem('deptTreeData',JSON.stringify(res))
 					window.localStorage.setItem('deptAllList',JSON.stringify(data))
 				})

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

@@ -44,6 +44,7 @@
 	import { mapGetters } from "vuex"
 	import store from '@/store';
 	import { getToken } from '@/utils/auth'
+	import pageData from '../myTask/repairList/addRepair/pageData.js'
 	export default {
 		data() {
 			return {
@@ -63,6 +64,7 @@
 		},
 		onLoad() {
 			this.init()
+			this.saveDept()
 			this.getFontSizeValue = uni.getStorageSync('fontSizeValue')+'rem'
 			// this.getFontSizeValue = '1.5rem'
 			if(uni.getStorageSync("roleCode") === "APRY"){
@@ -100,7 +102,12 @@
 				// 	//this.noticListData = this.$mConstDataConfig.noticListData
 				// }
 			},
-			
+			saveDept(){
+				pageData.getDet((res, data) => {
+					window.localStorage.setItem('deptTreeData',JSON.stringify(res))
+					window.localStorage.setItem('deptAllList',JSON.stringify(data))
+				})
+			},
 			changeStore() {
 				this.$mStore.dispatch("STATE", 3)
 			},

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

@@ -8,7 +8,7 @@
 					<order-select :orderType="valiFormData.WorkOrderCategory" @post-select-data="postSelectData"
 						:typeid="3000"></order-select>
 				</uni-forms-item>
-				<uni-forms-item label="设备资产编码" required name="epCode" v-show="showsb==true">
+				<uni-forms-item label="设备资产编码" name="epCode" v-show="showsb==true">
 					<uni-easyinput v-model="valiFormData.epCode" placeholder="请输入设备资产编码" />
 				</uni-forms-item>
 				<uni-forms-item label="报修内容" required name="Content">
@@ -196,23 +196,23 @@
 				this.isShowIsEnd = true
 				if (uni.getStorageSync("roleCode") == 'WXY') {
 					this.readonly = true
-					// this.valiFormData.MaintenanceDept = uni.getStorageSync("deptId")
-					// pageData.getPersonByDeptId(uni.getStorageSync("deptId"), (res, data, candidates) => {
-						// this.candidates = candidates
-						// this.candidatesDesignate = candidates
-						// this.MaintenancerData = res
-						// this.ApplicantData = res
-						// this.orderApplicantData = data
-						// this.valiFormData.Applicant = uni.getStorageSync("userCode")
-						// this.valiFormData.ApplicantName = this.$mHelper.findUserName(this.ApplicantData, uni.getStorageSync("userCode"))
-						// const user = this.orderApplicantData.find((o) => {
-						// 	return o.usercode === this.valiFormData.Applicant.toString()
-						// })
-						// if (user) {
-						// 	this.valiFormData.Phone = user.usertelphone
-						// }
-						// this.getLocation(this.valiFormData.Applicant)
-					// })
+					this.valiFormData.MaintenanceDept = uni.getStorageSync("deptId")
+					pageData.getPersonByDeptId(uni.getStorageSync("deptId"), (res, data, candidates) => {
+						this.candidates = candidates
+						this.candidatesDesignate = candidates
+						this.MaintenancerData = res
+						this.ApplicantData = res
+						this.orderApplicantData = data
+						this.valiFormData.Applicant = uni.getStorageSync("userCode")
+						this.valiFormData.ApplicantName = this.$mHelper.findUserName(this.ApplicantData, uni.getStorageSync("userCode"))
+						const user = this.orderApplicantData.find((o) => {
+							return o.usercode === this.valiFormData.Applicant.toString()
+						})
+						if (user) {
+							this.valiFormData.Phone = user.usertelphone
+						}
+						this.getLocation(this.valiFormData.Applicant)
+					})
 				}
 			}
 			this.workorderid = option.wid
@@ -231,8 +231,8 @@
 				console.log(this.$mHelper.findParents(this.departList, this.valiFormData.ApplicationDept))
 				this.valiFormData.ApplicationDept = this.$mHelper.findParents(this.departList, this.valiFormData
 					.ApplicationDept).split('/').length + '_' + this.valiFormData.ApplicationDept
-				// this.valiFormData.MaintenanceDept = this.$mHelper.findParents(this.departList, this.valiFormData
-				// 	.MaintenanceDept).split('/').length + '_' + this.valiFormData.MaintenanceDept
+				this.valiFormData.MaintenanceDept = this.$mHelper.findParents(this.departList, this.valiFormData
+					.MaintenanceDept).split('/').length + '_' + this.valiFormData.MaintenanceDept
 			}
 		},
 		methods: {
@@ -259,14 +259,14 @@
 				return id
 			},
 			// 工单类别
-			postSelectData(e, inf, orderType, biaoshi, text, auto) {
-				this.valiFormData.MaintenanceDept = ''
-				this.candidatesDesignate = []
-				this.MaintenancerData = []
-				this.valiFormData.Maintenancer = ''
-				this.valiFormData.MaintenancerName = ''
-				this.auto = auto
-				console.log(this.auto,'88888888899999999')
+			postSelectData(e, inf, orderType, biaoshi, text) {
+				// this.valiFormData.MaintenanceDept = ''
+				// this.candidatesDesignate = []
+				// this.MaintenancerData = []
+				// this.valiFormData.Maintenancer = ''
+				// this.valiFormData.MaintenancerName = ''
+				// this.auto = auto
+				console.log(e, inf, orderType, biaoshi, text)
 				if (biaoshi.indexOf('gzbx_sb') >= 0) {
 					this.showsb = true
 				} else {
@@ -276,9 +276,9 @@
 					this.orderInf = inf
 				}
 				this.valiFormData.WorkOrderCategory = e
-				if(this.auto){					
-				    this.getAuto()
-				}
+				// if(this.auto){					
+				//     this.getAuto()
+				// }
 			},
 			getAuto(){
 				//清空
@@ -342,7 +342,7 @@
 					this.valiFormData.ApplicantName = ''
 					this.valiFormData.Phone = ''
 					this.getDeptLocation(e.value.split('_')[1])
-					this.getAuto()
+					// this.getAuto()
 				}
 			},
 			//科室位置
@@ -392,7 +392,8 @@
 			handleZP(res) {
 				console.log(res)
 				this.valiFormData.MaintenancerName = res
-				this.valiFormData.Maintenancer = this.$mHelper.getValueByText(res, this.MaintenancerData)
+				// this.valiFormData.Maintenancer = this.$mHelper.getValueByText(res, this.MaintenancerData)
+				this.valiFormData.Maintenancer = this.$mHelper.getValueByText(res, this.ApplicantData)
 				console.log(this.valiFormData.Maintenancer)
 			},
 			// 工单提交

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/repairDetail/finishDetail/finishDetail.vue

@@ -13,21 +13,21 @@
 					<uni-data-select v-model="valiFormData.exceptionType" :localdata="exceptionTypeList">
 					</uni-data-select>
 				</uni-forms-item>
-				<uni-forms-item label="是否涉及设备" name="isEquipment" v-show="valiFormData.finishType == 0">
+				<uni-forms-item label="是否涉及耗材" name="isEquipment" v-show="valiFormData.finishType == 0">
 					<uni-data-checkbox v-model="valiFormData.isEquipment" :localdata="equipments" />
 				</uni-forms-item>
-				<uni-forms-item label="设备信息" name="equipmentid" v-show="valiFormData.isEquipment == 1 && valiFormData.finishType == 0">
+				<uni-forms-item label="耗材信息" name="equipmentid" v-show="valiFormData.isEquipment == 1 && valiFormData.finishType == 0">
 					<luyj-select-lay :value="valiFormData.equipmentid" lay-omit name="name" :options="equipmentList" :zindex="1" slabel='text' @selectitem="selectitem">
 					</luyj-select-lay>
 				</uni-forms-item>
 				<table class="equipmentInfo" v-show="equipmentCon.length>0 && valiFormData.finishType == 0">
 					<thead style="background-color: #fafafa;">
 						<tr class="trCon">
-							<td class="tdCon">设备</td>
-							<td class="tdCon">型号</td>
+							<td class="tdCon">耗材名称</td>
+							<td class="tdCon">规格型号</td>
 							<td class="tdCon">单价</td>
 							<td class="tdCon">数量</td>
-							<td class="tdCon">总价</td>
+							<td class="tdCon">价格</td>
 						</tr>
 					</thead>
 					<tbody>