liuzhihui 2 years ago
parent
commit
d59e458aea

+ 27 - 25
CallCenterWeb.UI/RMYY/src/components/workOrder/vehicleDispatch/addOrEdit.vue

@@ -81,42 +81,39 @@
81 81
               </el-select>
82 82
             </el-form-item>
83 83
           </el-col>
84
+        </el-row>
85
+        <el-row v-if="worktypeInfo!='bloodtransfer'">
84 86
           <el-col :span="12">
85 87
             <el-form-item label="联系人" prop="contact">
86 88
               <el-input v-model="ruleForm.contact" placeholder="请输入联系人" />
87 89
             </el-form-item>
88 90
           </el-col>
89
-        </el-row>
90
-        <el-row>
91
-          <!-- <el-col :span="12">
92
-            <el-form-item label="联系人" prop="contact">
93
-              <el-input v-model="ruleForm.contact" placeholder="请输入联系人" />
94
-            </el-form-item>
95
-          </el-col> -->
96
-          <!-- <el-col :span="12">
91
+          <el-col :span="12">
97 92
             <el-form-item label="联系人电话" prop="contactnumber">
98 93
               <el-input
99 94
                 v-model="ruleForm.contactnumber"
100 95
                 placeholder="请输入联系人电话"
101 96
               />
102 97
             </el-form-item>
103
-          </el-col> -->
98
+          </el-col>
104 99
         </el-row>
105 100
         <el-row>
106
-          <!-- <el-col :span="12">
107
-            <el-form-item label="科室位置" prop="startplace">
108
-              <el-input
109
-                v-model="ruleForm.startplace"
110
-                placeholder="请输入科室位置"
111
-              />
112
-            </el-form-item>
113
-          </el-col> -->
114 101
           <el-col :span="12">
115
-            <el-form-item label="联系人电话" prop="contactnumber">
116
-              <el-input
117
-                v-model="ruleForm.contactnumber"
118
-                placeholder="请输入联系人电话"
119
-              />
102
+            <el-form-item label="出车地点" prop="dispatch">
103
+              <el-select
104
+                v-model="ruleForm.dispatch"
105
+                style="width: 100%"
106
+                clearable
107
+                placeholder="请选择出车地点"
108
+              >
109
+                <el-option
110
+                  v-for="(item, index) in yqarr"
111
+                  :key="index"
112
+                  :label="item.T_Woname"
113
+                  :value="item.T_Woname"
114
+                >
115
+                </el-option>
116
+              </el-select>
120 117
             </el-form-item>
121 118
           </el-col>
122 119
           <el-col :span="12">
@@ -129,7 +126,7 @@
129 126
           </el-col>
130 127
         </el-row>
131 128
         <el-row>
132
-          <el-col :span="12">
129
+         <!-- <el-col :span="12">
133 130
             <el-form-item label="出车地点" prop="dispatch">
134 131
               <el-select
135 132
                 v-model="ruleForm.dispatch"
@@ -146,7 +143,7 @@
146 143
                 </el-option>
147 144
               </el-select>
148 145
             </el-form-item>
149
-          </el-col>
146
+          </el-col> -->
150 147
           <el-col :span="12">
151 148
             <el-form-item label="发车时间" prop="usertime">
152 149
               <el-date-picker
@@ -401,7 +398,8 @@ export default {
401 398
       this.worktypeInfo =
402 399
         this.$store.getters.workTypeMap[
403 400
           parseInt(this.orderTypeData.type2Arr[0])
404
-        ].tag;
401
+        ].tag || "";
402
+        console.log(this.worktypeInfo, "标识11");
405 403
       // this.ruleForm.F_Type2 = this.orderTypeData.F_Type2
406 404
       // this.ruleForm.identification = this.orderTypeData.identification
407 405
     },
@@ -541,6 +539,10 @@ export default {
541 539
         this.$message.error("填写工单内容");
542 540
         return;
543 541
       }
542
+      if(this.worktypeInfo == "bloodtransfer"){
543
+        this.ruleForm.contact = ""
544
+        this.ruleForm.contactnumber = ""
545
+      }
544 546
 
545 547
       this.$refs.ruleForm.validate((valid) => {
546 548
         if (valid) {

+ 5 - 1
CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue

@@ -406,7 +406,11 @@
406 406
             }
407 407
           } else {
408 408
             const res = response.data[0];
409
-            this.orderDetailData = res;
409
+            this.orderDetailData = res;
410
+            //处理人隐藏评价
411
+            if(window.localStorage.getItem("storageUsercode") == response.data[0].F_DealMan){
412
+              this.$refs.tabs.$children[0].$refs.tabs[2].style.display = "none";
413
+            }
410 414
             const imgs = [];
411 415
             const others = [];
412 416
             const fileUrls = [

+ 4 - 18
CallCenterWeb.UI/RMYY/src/views/orderManage/components/cardetail.vue

@@ -155,24 +155,6 @@
155 155
                   文字评价:{{ evaluateData.F_Evaluator }}</el-col
156 156
                 >
157 157
               </div>
158
-             <!-- <el-table :data="evaluateData" border style="width: 100%">
159
-                <el-table-column
160
-                  prop="F_EvaluateUser"
161
-                  label="评价人"
162
-                  align="center"
163
-                />
164
-                <el-table-column
165
-                  prop="F_Evaluator"
166
-                  label="评价内容"
167
-                  align="center"
168
-                />
169
-                <el-table-column prop="F_Score" label="评分" align="center" />
170
-                <el-table-column
171
-                  prop="F_EvaluationTime"
172
-                  label="评价时间"
173
-                  align="center"
174
-                />
175
-              </el-table> -->
176 158
             </el-tab-pane>
177 159
           </el-tabs>
178 160
         </el-card>
@@ -280,6 +262,10 @@ export default {
280 262
           this.workOrderCirculationList = response.data;
281 263
         }
282 264
         if (num == 0) {
265
+          //处理人隐藏评价
266
+          if(window.localStorage.getItem("storageUsercode") == response.model.F_DriverCode){
267
+            this.$refs.tabs.$children[0].$refs.tabs[1].style.display = "none";
268
+          }
283 269
           const res = response.model;
284 270
           this.orderDetailData = res;
285 271
           if (

+ 4 - 0
CallCenterWeb.UI/RMYY/src/views/orderManage/components/orderDetail.vue

@@ -499,6 +499,10 @@ export default {
499 499
       };
500 500
       GetFaultRepairDetail(params).then((response) => {
501 501
         if (type == "1" && response.data[0]) {
502
+          //处理人隐藏评价
503
+          if(window.localStorage.getItem("storageUsercode") == response.data[0].F_Maintenancer){
504
+            this.$refs.tabs.$children[0].$refs.tabs[4].style.display = "none";
505
+          }
502 506
           this.tabData1 = response.data[0];
503 507
           this.tabData1.F_MaintenanceDept =
504 508
             this.$store.getters.deptmap[

+ 6 - 0
CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/driverOrder/index.vue

@@ -98,6 +98,12 @@
98 98
       />
99 99
       <el-table-column
100 100
         :show-overflow-tooltip="true"
101
+        prop="F_CreateTime"
102
+        label="派单时间"
103
+        align="center"
104
+      />
105
+      <el-table-column
106
+        :show-overflow-tooltip="true"
101 107
         prop="F_CloseTime"
102 108
         label="完工时间"
103 109
         align="center"

+ 4 - 18
CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/components/detail.vue

@@ -168,24 +168,6 @@
168 168
                   文字评价:{{ evaluateData.F_Evaluator }}</el-col
169 169
                 >
170 170
               </div>
171
-              <!-- <el-table :data="evaluateData" border style="width: 100%">
172
-                <el-table-column
173
-                  prop="F_EvaluateUser"
174
-                  label="评价人"
175
-                  align="center"
176
-                />
177
-                <el-table-column
178
-                  prop="F_Evaluator"
179
-                  label="评价内容"
180
-                  align="center"
181
-                />
182
-                <el-table-column prop="F_Score" label="评分" align="center" />
183
-                <el-table-column
184
-                  prop="F_EvaluationTime"
185
-                  label="评价时间"
186
-                  align="center"
187
-                />
188
-              </el-table> -->
189 171
             </el-tab-pane>
190 172
           </el-tabs>
191 173
         </el-card>
@@ -264,6 +246,10 @@ export default {
264 246
       };
265 247
       getModelDetail(params).then((response) => {
266 248
         if (num == 0) {
249
+          //处理人隐藏评价
250
+          if(window.localStorage.getItem("storageUsercode") == response.model.F_DriverCode){
251
+            this.$refs.tabs.$children[0].$refs.tabs[1].style.display = "none";
252
+          }
267 253
           this.orderDetailData = response.model;
268 254
           this.orderDetailData.F_TypeName2 =
269 255
             this.$store.getters.workTypeMap[

+ 6 - 0
CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/index.vue

@@ -128,6 +128,12 @@
128 128
       />
129 129
       <el-table-column
130 130
         :show-overflow-tooltip="true"
131
+        prop="F_AssignTime"
132
+        label="派单时间"
133
+        align="center"
134
+      />
135
+      <el-table-column
136
+        :show-overflow-tooltip="true"
131 137
         prop="StateName"
132 138
         label="工单状态"
133 139
         align="center"

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

@@ -8,8 +8,8 @@
8 8
 					<order-select :orderType="valiFormData.WorkOrderCategory" @post-select-data="postSelectData"
9 9
 						:typeid="2000" :readonly="readonly"></order-select>
10 10
 				</uni-forms-item>
11
-				<uni-forms-item label="申请部门" required name="ApplicationDept">
12
-					<uni-data-picker placeholder="请选择申请部门" :localdata="deptDataTree"
11
+				<uni-forms-item label="申请科室" required name="ApplicationDept">
12
+					<uni-data-picker :readonly="true" placeholder="请选择申请科室" :localdata="deptDataTree"
13 13
 						v-model="valiFormData.ApplicationDept" @nodeclick="deptNodeclick" :showSearch="showSearch" @popupclosed="popupclosedDept" @searchTrue="departSearchTrue">
14 14
 					</uni-data-picker>
15 15
 				</uni-forms-item>

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

@@ -15,7 +15,7 @@
15 15
 					<uni-easyinput type="textarea" v-model="valiFormData.Content" placeholder="请输入报修内容" />
16 16
 				</uni-forms-item>
17 17
 				<uni-forms-item label="报修科室" required name="ApplicationDept">
18
-					<uni-data-picker :showSearch="showSearch" placeholder="请选择报修科室" :localdata="deptDataTree"
18
+					<uni-data-picker :readonly="true" :showSearch="showSearch" placeholder="请选择报修科室" :localdata="deptDataTree"
19 19
 						v-model="valiFormData.ApplicationDept" @nodeclick="deptNodeclick" @popupclosed="popupclosedDept" @searchTrue="departSearchTrue">
20 20
 					</uni-data-picker>
21 21
 				</uni-forms-item>

+ 11 - 6
CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/applicantsList/addVehicle/addVehicle.vue

@@ -7,9 +7,8 @@
7 7
 				<uni-forms-item label="工单类别" required name="WorkOrderCategory">
8 8
 					<order-select :orderType="valiFormData.WorkOrderCategory" @post-select-data="postSelectData" :typeid="4000" :readonly="detpReadonly"></order-select>
9 9
 				</uni-forms-item>
10
-				<uni-forms-item label="申请科室" required name="detpid">
11
-					
12
-					<uni-data-picker placeholder="请选择科室" :showSearch= "showSearch" v-if="!detpReadonly" :readonly="detpReadonly" :localdata="deptDataTree" v-model="valiFormData.detpid" @nodeclick="deptNodeclick" @popupclosed="popupclosedDept" @searchTrue="departSearchTrue">
10
+				<uni-forms-item label="申请科室" required name="detpid">				
11
+					<uni-data-picker placeholder="请选择科室" :showSearch= "showSearch" v-if="!detpReadonly" :readonly="true" :localdata="deptDataTree" v-model="valiFormData.detpid" @nodeclick="deptNodeclick" @popupclosed="popupclosedDept" @searchTrue="departSearchTrue">
13 12
 					</uni-data-picker>
14 13
 					<uni-easyinput disabled v-model="valiFormData.F_ProposerDeptName" v-if="detpReadonly" />
15 14
 				</uni-forms-item>
@@ -25,10 +24,10 @@
25 24
 				<uni-forms-item label="申请人电话" required name="Phone">
26 25
 					<uni-easyinput v-model="valiFormData.Phone" :disabled="detpReadonly" placeholder="请输入联系电话" />
27 26
 				</uni-forms-item>
28
-				<uni-forms-item label="联系人" required name="contact">
27
+				<uni-forms-item v-if="worktypeInfo!='bloodtransfer'" label="联系人" required name="contact">
29 28
 					<uni-easyinput v-model="valiFormData.contact" placeholder="请输入联系人" />
30 29
 				</uni-forms-item>
31
-				<uni-forms-item label="联系电话" required name="contactnumber">
30
+				<uni-forms-item v-if="worktypeInfo!='bloodtransfer'" label="联系电话" required name="contactnumber">
32 31
 					<uni-easyinput v-model="valiFormData.contactnumber" placeholder="请输入联系电话" />
33 32
 				</uni-forms-item>
34 33
 				<uni-forms-item label="车辆要求" required name="cartype">
@@ -82,6 +81,7 @@
82 81
 		},
83 82
 		data() {
84 83
 			return {
84
+				worktypeInfo:"",//工单标识
85 85
 				getFontSizeValue:'1rem',
86 86
 				showSearch: true,
87 87
 				readonly: false,
@@ -316,7 +316,8 @@
316 316
 			postSelectData(e, id, type, identification, text){
317 317
 				this.valiFormData.WorkOrderCategory = e
318 318
 				this.typeName = text
319
-				console.log(text, 'e')
319
+				this.worktypeInfo = identification
320
+				console.log(identification,text, 'e')
320 321
 			},
321 322
 			//申请人
322 323
 			changeApplicant(res) {
@@ -339,6 +340,10 @@
339 340
 				if(this.valiFormData.usertime.length==11){
340 341
 					this.valiFormData.usertime = this.valiFormData.usertime+"00:00:00"
341 342
 				}
343
+				if(this.worktypeInfo=='bloodtransfer'){
344
+					this.valiFormData.contact = ""
345
+					this.valiFormData.contactnumber = ""
346
+				}
342 347
 				this.disabledButton = false
343 348
 				this.$refs[ref].validate().then(res => {
344 349
 					if(this.valiFormData.birth ===0&&this.valiFormData.content ===""){