liuzhihui лет назад: 2
Родитель
Сommit
c7bb53c663

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

@@ -758,7 +758,7 @@ export default {
758 758
         usercode: 0, // 申请人id
759 759
         phone: "", // 联系电话
760 760
         position: "",
761
-        toplace: "",
761
+        // toplace: "",
762 762
         content: "",
763 763
         cfnum: "",
764 764
         opt: "2",

+ 13 - 13
CallCenterWeb.UI/RMYY/src/views/comDispatch/components/addOrEditDispatch.vue

@@ -278,7 +278,7 @@
278 278
             />
279 279
           </el-form-item>
280 280
         </el-col>
281
-        <el-row>
281
+        <!-- <el-row>
282 282
           <el-col :span="24">
283 283
             <el-form-item label="送达地点" prop="toplace">
284 284
               <el-input
@@ -288,7 +288,7 @@
288 288
               />
289 289
             </el-form-item>
290 290
           </el-col>
291
-        </el-row>
291
+        </el-row> -->
292 292
         <el-row>
293 293
           <el-col :span="24">
294 294
             <el-form-item label="工单内容" prop="content">
@@ -468,7 +468,7 @@ export default {
468 468
         usercode: 0, // 申请人id
469 469
         phone: "", // 联系电话
470 470
         position: "",
471
-        toplace: "",
471
+        // toplace: "",
472 472
         content: "",
473 473
         cfnum: "",
474 474
         opt: "1",
@@ -497,13 +497,13 @@ export default {
497 497
             trigger: "blur",
498 498
           },
499 499
         ],
500
-        toplace: [
501
-          {
502
-            required: true,
503
-            message: "送达地点不能为空",
504
-            trigger: "blur",
505
-          },
506
-        ],
500
+        // toplace: [
501
+        //   {
502
+        //     required: true,
503
+        //     message: "送达地点不能为空",
504
+        //     trigger: "blur",
505
+        //   },
506
+        // ],
507 507
         content: [
508 508
           {
509 509
             required: true,
@@ -723,7 +723,7 @@ export default {
723 723
             this.ruleForm.cfnum = res.F_RemindCount;
724 724
             this.ruleForm.phone = res.F_Phone;
725 725
             this.ruleForm.position = res.F_Location;
726
-            this.ruleForm.toplace = res.F_ToPlace;
726
+            // this.ruleForm.toplace = res.F_ToPlace;
727 727
             this.ruleForm.content = res.F_Content;
728 728
             const arr = [];
729 729
             res.PSInfo.forEach(function (v, n) {
@@ -778,7 +778,7 @@ export default {
778 778
             phone: this.ruleForm.phone,
779 779
             Location: this.ruleForm.position,
780 780
             WorkOrderCategory: this.ruleForm.F_Type2,
781
-            ToPlace: this.ruleForm.toplace,
781
+            // ToPlace: this.ruleForm.toplace,
782 782
             Content: this.ruleForm.content,
783 783
             DealDept: this.ruleForm.DealDept,
784 784
             DealMan: this.ruleForm.clid,
@@ -793,7 +793,7 @@ export default {
793 793
             phone: this.ruleForm.phone,
794 794
             Location: this.ruleForm.position,
795 795
             WorkOrderCategory: this.ruleForm.F_Type2,
796
-            ToPlace: this.ruleForm.toplace,
796
+            // ToPlace: this.ruleForm.toplace,
797 797
             Content: this.ruleForm.content,
798 798
             DealDept: this.ruleForm.DealDept,
799 799
             DealMan: this.ruleForm.clid,

+ 13 - 6
CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/repairEdit.vue

@@ -32,7 +32,7 @@
32 32
             </el-form-item>
33 33
           </el-col>
34 34
         </el-row>
35
-        <el-row v-if="worktypeInfo === 'gzbx_shebei'">
35
+        <el-row v-if="worktypeInfo.indexOf('gzbx_sb') >=0 ">
36 36
           <el-col :span="20">
37 37
             <el-form-item label="设备资产编码" prop="F_DeviceEncode">
38 38
               <el-input
@@ -287,12 +287,13 @@ export default {
287 287
           this.ruleForm.repairCenter = response.data[0].F_Content; //内容
288 288
           this.ruleForm.repairAddress = response.data[0].F_PlaceOfRepair; //地点
289 289
           // this.worktypeInfo = this.$store.getters.workTypeMap[parseInt(response.data[0].F_WorkOrderCategory)].ids.slice(1).tag
290
-          const worktype2 =
291
-            this.$store.getters.workTypeMap[
292
-              parseInt(response.data[0].F_WorkOrderCategory)
293
-            ].ids.slice(1)[0];
290
+          // const worktype2 =
291
+          //   this.$store.getters.workTypeMap[
292
+          //     parseInt(response.data[0].F_WorkOrderCategory)
293
+          //   ].ids.slice(1)[0];
294 294
           this.worktypeInfo =
295
-            this.$store.getters.workTypeMap[parseInt(worktype2)].tag;
295
+            this.$store.getters.workTypeMap[parseInt(response.data[0].F_WorkOrderCategory)].tag;
296
+            console.log(this.worktypeInfo)
296 297
           // this.ruleForm.assignDepart = response.data[0].F_MaintenanceDept
297 298
           if (response.data[0].FileUrl) {
298 299
             for (var i = 0; i < response.data[0].FileUrl.length; i++) {
@@ -313,6 +314,12 @@ export default {
313 314
       // this.ruleForm.repairOrderType = data.value;
314 315
       this.ruleForm.F_Type2 = data.value;
315 316
       console.log(data.value);
317
+      this.worktypeInfo =
318
+        this.$store.getters.workTypeMap[parseInt(data.value)].tag;
319
+      console.log(this.worktypeInfo)
320
+      if(this.worktypeInfo.indexOf('gzbx_sb')<0){
321
+        this.ruleForm.F_DeviceEncode = ""
322
+      }
316 323
     },
317 324
     handle_success(res) {
318 325
       this.ruleForm.repairImageid += res.data[0].F_FileId + ",";

+ 4 - 4
CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/scheduleEdit.vue

@@ -162,7 +162,7 @@
162 162
             />
163 163
           </el-form-item>
164 164
         </el-col>
165
-        <el-row>
165
+        <!-- <el-row>
166 166
           <el-col :span="24">
167 167
             <el-form-item label="送达地点">
168 168
               <el-input
@@ -172,7 +172,7 @@
172 172
               />
173 173
             </el-form-item>
174 174
           </el-col>
175
-        </el-row>
175
+        </el-row> -->
176 176
         <el-row>
177 177
           <el-col :span="24">
178 178
             <el-form-item label="工单内容" prop="remark">
@@ -307,7 +307,7 @@ export default {
307 307
         WorkOrderCategory: "", // 工单类别
308 308
         Content: "", // 工单内容
309 309
         Location: "", // 科室位置
310
-        ToPlace: "", // 送达地点
310
+        // ToPlace: "", // 送达地点
311 311
         File: "", // 文件
312 312
         DealMan: "", // 从节目
313 313
         WorkOrderCode: "", // 工单编号
@@ -443,7 +443,7 @@ export default {
443 443
         WorkOrderCategory: this.ruleForm.WorkOrderCategory, // 工单类别
444 444
         Content: this.ruleForm.Content, // 工单内容
445 445
         Location: this.ruleForm.Location, // 科室位置
446
-        ToPlace: this.ruleForm.ToPlace, // 送达地点
446
+        // ToPlace: this.ruleForm.ToPlace, // 送达地点
447 447
         File: this.ruleForm.File, // 文件
448 448
         WorkOrderCode: this.ruleForm.WorkOrderCode, // 工单编号
449 449
         detailists: details,