liuzhihui %!s(int64=3) %!d(string=hace) años
padre
commit
cf94cebb81
Se han modificado 22 ficheros con 1181 adiciones y 1418 borrados
  1. 528 670
      CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue
  2. 599 717
      CallCenterWeb.UI/RMYY/src/components/workOrder/information/addOrEditInfOrder.vue
  3. 3 2
      CallCenterWeb.UI/RMYY/src/components/workOrder/repairbase/addRepairbase.vue
  4. 4 3
      CallCenterWeb.UI/RMYY/src/components/workOrder/vehicleDispatch/addOrEdit.vue
  5. 2 2
      CallCenterWeb.UI/RMYY/src/views/callScreen/components/OrderList.vue
  6. 9 5
      CallCenterWeb.UI/RMYY/src/views/callScreen/components/drugList.vue
  7. 1 1
      CallCenterWeb.UI/RMYY/src/views/comDispatch/EquipmentLeasing/EquipmentLeasingList/index.vue
  8. 4 0
      CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue
  9. 1 1
      CallCenterWeb.UI/RMYY/src/views/comDispatch/components/distributionList.vue
  10. 1 1
      CallCenterWeb.UI/RMYY/src/views/comDispatch/ebcomponents/ebTabList.vue
  11. 2 1
      CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/repairList/index.vue
  12. 4 0
      CallCenterWeb.UI/RMYY/src/views/orderManage/components/askdetail.vue
  13. 4 0
      CallCenterWeb.UI/RMYY/src/views/orderManage/components/cardetail.vue
  14. 6 2
      CallCenterWeb.UI/RMYY/src/views/orderManage/components/orderDetail.vue
  15. 1 1
      CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/index.vue
  16. 3 3
      CallCenterWeb.UI/RMYY/src/views/orderManage/orderList/index.vue
  17. 1 1
      CallCenterWeb.UI/RMYY/src/views/orderManage/patientVisit/visit.vue
  18. 2 2
      CallCenterWeb.UI/RMYY/src/views/trafficData/callRecord/index.vue
  19. 1 1
      CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleManagement/components/addOrEdit.vue
  20. 2 2
      CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/components/addOrEdit.vue
  21. 2 2
      CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/components/assign.vue
  22. 1 1
      CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/components/distribution.vue

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 528 - 670
CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 599 - 717
CallCenterWeb.UI/RMYY/src/components/workOrder/information/addOrEditInfOrder.vue


+ 3 - 2
CallCenterWeb.UI/RMYY/src/components/workOrder/repairbase/addRepairbase.vue

151
           <el-button
151
           <el-button
152
             type="primary"
152
             type="primary"
153
             @click="submitForm('ruleForm')"
153
             @click="submitForm('ruleForm')"
154
-          >保存</el-button
154
+          >提交工单</el-button
155
           >
155
           >
156
         </el-form-item>
156
         </el-form-item>
157
       </el-row>
157
       </el-row>
210
         pid: 3000
210
         pid: 3000
211
       },
211
       },
212
       cid: '',
212
       cid: '',
213
-      usercodeSearch: '',
213
+      usercodeSearch: window.localStorage.getItem('storageUsercode'),
214
       orderarr: [],
214
       orderarr: [],
215
       isedit: false,
215
       isedit: false,
216
       ordertypeArr: [],
216
       ordertypeArr: [],
340
       this.ruleForm.repairmanphone = this.$store.getters.mobile
340
       this.ruleForm.repairmanphone = this.$store.getters.mobile
341
       this.ruleForm.repairmanCallNumber = this.$store.getters.mobile
341
       this.ruleForm.repairmanCallNumber = this.$store.getters.mobile
342
     }
342
     }
343
+    this.getUserData()
343
   },
344
   },
344
   methods: {
345
   methods: {
345
     getUserData() {
346
     getUserData() {

+ 4 - 3
CallCenterWeb.UI/RMYY/src/components/workOrder/vehicleDispatch/addOrEdit.vue

94
           </el-col>
94
           </el-col>
95
         </el-row>
95
         </el-row>
96
         <el-form-item>
96
         <el-form-item>
97
-          <el-button type="primary" @click="submitForm">保存</el-button>
98
-          <el-button @click="resetForm">重置</el-button>
97
+          <el-button type="primary" @click="submitForm">提交工单</el-button>
98
+          <!-- <el-button @click="resetForm">重置</el-button> -->
99
         </el-form-item>
99
         </el-form-item>
100
       </el-col>
100
       </el-col>
101
     </el-form>
101
     </el-form>
269
           type2Arr: []
269
           type2Arr: []
270
         },
270
         },
271
         deptid: [],
271
         deptid: [],
272
-        usercodeSearch: '',
272
+        usercodeSearch: window.localStorage.getItem('storageUsercode'),
273
         loading: false
273
         loading: false
274
       }
274
       }
275
     },
275
     },
306
         this.ruleForm.needman = this.$store.getters.usercode
306
         this.ruleForm.needman = this.$store.getters.usercode
307
         this.ruleForm.phon = this.$store.getters.mobile
307
         this.ruleForm.phon = this.$store.getters.mobile
308
       }
308
       }
309
+      this.getUserData()
309
     },
310
     },
310
     methods: {
311
     methods: {
311
       getUserData() {
312
       getUserData() {

+ 2 - 2
CallCenterWeb.UI/RMYY/src/views/callScreen/components/OrderList.vue

128
             } // props
128
             } // props
129
           },
129
           },
130
           area: ['80%', '90%'],
130
           area: ['80%', '90%'],
131
-          title: '单详情'
131
+          title: '单详情'
132
         })
132
         })
133
       }
133
       }
134
       if (row.F_Type == 1000) {
134
       if (row.F_Type == 1000) {
141
             } // props
141
             } // props
142
           },
142
           },
143
           area: ['80%', '90%'],
143
           area: ['80%', '90%'],
144
-          title: '单详情'
144
+          title: '单详情'
145
         })
145
         })
146
       }
146
       }
147
       if (row.F_Type === 2000) {
147
       if (row.F_Type === 2000) {

+ 9 - 5
CallCenterWeb.UI/RMYY/src/views/callScreen/components/drugList.vue

7
     </div>
7
     </div>
8
 
8
 
9
     <el-table border stripe :data='tableData' :highlight-current-row="true" @row-click="handleRow">
9
     <el-table border stripe :data='tableData' :highlight-current-row="true" @row-click="handleRow">
10
-      <el-table-column :show-overflow-tooltip="true" prop="cDgName" label="药品名称" width="200" align="center" />
11
-      <el-table-column :show-overflow-tooltip="true" prop="cDgNameCode" label="药品编码" align="center" />
12
-      <el-table-column :show-overflow-tooltip="true" prop="cDgSpecification" label="规格" align="center" />
13
-      <el-table-column :show-overflow-tooltip="true" prop="iDgStdPrice" label="价格" align="center" />
14
-      <el-table-column :show-overflow-tooltip="true" prop="cDgDescription" label="药品说明" align="center" />
10
+      <el-table-column width="180" prop="cDgName" label="品名" align="center" />
11
+      <el-table-column :show-overflow-tooltip="true" prop="" label="商品名" align="center" />
12
+      <el-table-column prop="cDgSpecification" label="规格" align="center" />
13
+      <el-table-column :show-overflow-tooltip="true" prop="" label="生产厂家" align="center" />
14
+      <el-table-column :show-overflow-tooltip="true" prop="" label="包装" align="center" />
15
+      <el-table-column :show-overflow-tooltip="true" prop="iDgStdPrice" label="单价" align="center" />
16
+      <el-table-column :show-overflow-tooltip="true" prop="" label="划价库存" align="center" />
17
+      <el-table-column :show-overflow-tooltip="true" prop="" label="包装库存" align="center" />
18
+      <el-table-column :show-overflow-tooltip="true" prop="" label="属性" align="center" />
15
     </el-table>
19
     </el-table>
16
     <pagination
20
     <pagination
17
       v-show="pageParams.total > 0"
21
       v-show="pageParams.total > 0"

+ 1 - 1
CallCenterWeb.UI/RMYY/src/views/comDispatch/EquipmentLeasing/EquipmentLeasingList/index.vue

390
             } // props
390
             } // props
391
           },
391
           },
392
           area: ['80%', '90%'],
392
           area: ['80%', '90%'],
393
-          title: '订单详情'
393
+          title: '详情'
394
         })
394
         })
395
       },
395
       },
396
       //删除
396
       //删除

+ 4 - 0
CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue

55
                 <th>-</th>
55
                 <th>-</th>
56
               </tr>
56
               </tr>
57
               <tr>
57
               <tr>
58
+                <th>紧急情况:</th>
59
+                <td colspan="5">{{ orderDetailData.F_EmergencyTypes }}</td>
60
+              </tr>
61
+              <tr>
58
                 <th>工单内容:</th>
62
                 <th>工单内容:</th>
59
                 <td colspan="5">{{ orderDetailData.F_Content }}</td>
63
                 <td colspan="5">{{ orderDetailData.F_Content }}</td>
60
               </tr>
64
               </tr>

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

151
           data: { rowid: ordercode } // props
151
           data: { rowid: ordercode } // props
152
         },
152
         },
153
         area: ['80%', '90%'],
153
         area: ['80%', '90%'],
154
-        title: '单详情'
154
+        title: '单详情'
155
       })
155
       })
156
     },
156
     },
157
     // 转派工单
157
     // 转派工单

+ 1 - 1
CallCenterWeb.UI/RMYY/src/views/comDispatch/ebcomponents/ebTabList.vue

374
             } // props
374
             } // props
375
           },
375
           },
376
           area: ['80%', '90%'],
376
           area: ['80%', '90%'],
377
-          title: '订单详情'
377
+          title: '详情'
378
         })
378
         })
379
       },
379
       },
380
       //删除
380
       //删除

+ 2 - 1
CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/repairList/index.vue

860
           } // props
860
           } // props
861
         },
861
         },
862
         area: ['80%', '90%'],
862
         area: ['80%', '90%'],
863
-        title: '单详情'
863
+        title: '单详情'
864
       })
864
       })
865
     },
865
     },
866
     isShowButton(row, key) {
866
     isShowButton(row, key) {
1152
             type: 'success',
1152
             type: 'success',
1153
             message: '挂起成功!'
1153
             message: '挂起成功!'
1154
           })
1154
           })
1155
+          this.dialogHangUp = false
1155
           this.getListTask()
1156
           this.getListTask()
1156
         }
1157
         }
1157
       })
1158
       })

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

86
                 </td>
86
                 </td>
87
               </tr>
87
               </tr>
88
               <tr>
88
               <tr>
89
+                <th>紧急情况:</th>
90
+                <td colspan="5">{{ orderDetailData.F_EmergencyTypes }}</td>
91
+              </tr>
92
+              <tr>
89
                 <th>工单内容:</th>
93
                 <th>工单内容:</th>
90
                 <td colspan="5">{{ orderDetailData.F_WorkOrderContents }}</td>
94
                 <td colspan="5">{{ orderDetailData.F_WorkOrderContents }}</td>
91
               </tr>
95
               </tr>

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

55
                 <td>{{ orderDetailData.F_Birth=='0'?'否':'是' }}</td>
55
                 <td>{{ orderDetailData.F_Birth=='0'?'否':'是' }}</td>
56
               </tr>
56
               </tr>
57
               <tr>
57
               <tr>
58
+                <th>紧急情况:</th>
59
+                <td colspan="5">{{ orderDetailData.F_EmergencyTypes }}</td>
60
+              </tr>
61
+              <tr>
58
                 <th>工单内容:</th>
62
                 <th>工单内容:</th>
59
                 <td colspan="5">{{ orderDetailData.F_Content }}</td>
63
                 <td colspan="5">{{ orderDetailData.F_Content }}</td>
60
               </tr>
64
               </tr>

+ 6 - 2
CallCenterWeb.UI/RMYY/src/views/orderManage/components/orderDetail.vue

44
                 <th>报修地点:</th>
44
                 <th>报修地点:</th>
45
                 <td colspan="3">{{ orderDetailData.F_PlaceOfRepair }}</td>
45
                 <td colspan="3">{{ orderDetailData.F_PlaceOfRepair }}</td>
46
                 <th>提交人:</th>
46
                 <th>提交人:</th>
47
-                <td>{{ orderDetailData.F_CreateUser }}</td>
47
+                <td>{{ orderDetailData.applicantname }}</td>
48
+              </tr>
49
+              <tr>
50
+                <th>紧急情况:</th>
51
+                <td colspan="5">{{ orderDetailData.F_EmergencyTypes }}</td>
48
               </tr>
52
               </tr>
49
               <tr>
53
               <tr>
50
                 <th>工单内容:</th>
54
                 <th>工单内容:</th>
87
                       <th>完成情况:</th>
91
                       <th>完成情况:</th>
88
                       <td>{{ repairList[0] ? repairList[0].dealtype : '-' }}</td>
92
                       <td>{{ repairList[0] ? repairList[0].dealtype : '-' }}</td>
89
                       <th>异常原因:</th>
93
                       <th>异常原因:</th>
90
-                      <td>{{ repairList[0] ? repairList[0].F_ReturnReason : '-' }}</td>
94
+                      <td>{{ repairList[0] ? repairList[0].F_ExceptionType : '-' }}</td>
91
                       <th>有无耗材:</th>
95
                       <th>有无耗材:</th>
92
                       <td>{{ (repairList[0] && repairList[0].F_IsInvolvedEquip) ? '有' : '无' }}</td>
96
                       <td>{{ (repairList[0] && repairList[0].F_IsInvolvedEquip) ? '有' : '无' }}</td>
93
                     </tr>
97
                     </tr>

+ 1 - 1
CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/index.vue

483
             } // props
483
             } // props
484
           },
484
           },
485
           area: ['80%', '90%'],
485
           area: ['80%', '90%'],
486
-          title: '单详情'
486
+          title: '单详情'
487
         })
487
         })
488
       }
488
       }
489
       if (row.F_Type === 1000) {
489
       if (row.F_Type === 1000) {

+ 3 - 3
CallCenterWeb.UI/RMYY/src/views/orderManage/orderList/index.vue

396
             } // props
396
             } // props
397
           },
397
           },
398
           area: ['80%', '90%'],
398
           area: ['80%', '90%'],
399
-          title: '单详情'
399
+          title: '单详情'
400
         })
400
         })
401
       }
401
       }
402
       if (row.F_Type === 1000) {
402
       if (row.F_Type === 1000) {
409
             } // props
409
             } // props
410
           },
410
           },
411
           area: ['80%', '90%'],
411
           area: ['80%', '90%'],
412
-          title: '单详情'
412
+          title: '单详情'
413
         })
413
         })
414
       }
414
       }
415
       if (row.F_Type === 2000) {
415
       if (row.F_Type === 2000) {
422
             } // props
422
             } // props
423
           },
423
           },
424
           area: ['80%', '90%'],
424
           area: ['80%', '90%'],
425
-          title: '单详情'
425
+          title: '单详情'
426
         })
426
         })
427
       }
427
       }
428
     },
428
     },

+ 1 - 1
CallCenterWeb.UI/RMYY/src/views/orderManage/patientVisit/visit.vue

17
             <th>姓名:</th>
17
             <th>姓名:</th>
18
             <td>{{ orderDetailData.F_Customer }}</td>
18
             <td>{{ orderDetailData.F_Customer }}</td>
19
             <th>性别:</th>
19
             <th>性别:</th>
20
-            <td>{{orderDetailData.F_Sex}}</td>
20
+            <td>{{orderDetailData.F_Sex==0?'男':'女'}}</td>
21
             <th>联系电话:</th>
21
             <th>联系电话:</th>
22
             <td>{{orderDetailData.F_Phon}} <i class="el-icon-mobile" style="
22
             <td>{{orderDetailData.F_Phon}} <i class="el-icon-mobile" style="
23
               color: #24c6c8;
23
               color: #24c6c8;

+ 2 - 2
CallCenterWeb.UI/RMYY/src/views/trafficData/callRecord/index.vue

86
         align="center"
86
         align="center"
87
       >
87
       >
88
         <template slot-scope="scope">
88
         <template slot-scope="scope">
89
-          <span>{{ scope.row.CallNumber }}</span>
90
           <i
89
           <i
91
             v-if="scope.row.CallState == 0"
90
             v-if="scope.row.CallState == 0"
92
             class="el-icon-mobile"
91
             class="el-icon-mobile"
94
               color: #24c6c8;
93
               color: #24c6c8;
95
               font-size: 20px;
94
               font-size: 20px;
96
               vertical-align: middle;
95
               vertical-align: middle;
97
-              margin-left: 5px;
96
+              margin-right: 5px;
98
               cursor: pointer;
97
               cursor: pointer;
99
             "
98
             "
100
             @click="oncall(scope.row, scope.$index)"
99
             @click="oncall(scope.row, scope.$index)"
101
           />
100
           />
101
+          <span>{{ scope.row.CallNumber }}</span>
102
         </template>
102
         </template>
103
       </el-table-column>
103
       </el-table-column>
104
       <el-table-column
104
       <el-table-column

+ 1 - 1
CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleManagement/components/addOrEdit.vue

43
         </el-col>
43
         </el-col>
44
       </el-row>
44
       </el-row>
45
       <el-form-item>
45
       <el-form-item>
46
-        <el-button type="primary" @click="submitForm">保存</el-button>
46
+        <el-button type="primary" @click="submitForm">提交</el-button>
47
         <!-- <el-button @click="resetForm">重置</el-button> -->
47
         <!-- <el-button @click="resetForm">重置</el-button> -->
48
       </el-form-item>
48
       </el-form-item>
49
     </el-form>
49
     </el-form>

+ 2 - 2
CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/components/addOrEdit.vue

88
           </el-col>
88
           </el-col>
89
         </el-row>
89
         </el-row>
90
         <el-form-item>
90
         <el-form-item>
91
-          <el-button type="primary" @click="submitForm">保存</el-button>
92
-          <el-button @click="resetForm">重置</el-button>
91
+          <el-button type="primary" @click="submitForm">提交工单</el-button>
92
+          <!-- <el-button @click="resetForm">重置</el-button> -->
93
         </el-form-item>
93
         </el-form-item>
94
       </el-col>
94
       </el-col>
95
     </el-form>
95
     </el-form>

+ 2 - 2
CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/components/assign.vue

37
           </el-col>
37
           </el-col>
38
         </el-row>
38
         </el-row>
39
         <el-form-item>
39
         <el-form-item>
40
-          <el-button @click="resetForm">取 消</el-button>
41
-          <el-button type="primary" @click="sureAssign()">确 定</el-button>
40
+          <!-- <el-button @click="resetForm">取 消</el-button> -->
41
+          <el-button type="primary" @click="sureAssign()">提交</el-button>
42
         </el-form-item>
42
         </el-form-item>
43
       </el-col>
43
       </el-col>
44
     </el-form>
44
     </el-form>

+ 1 - 1
CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/components/distribution.vue

32
           </el-col>
32
           </el-col>
33
         </el-row>
33
         </el-row>
34
         <el-form-item>
34
         <el-form-item>
35
-          <el-button type="primary" @click="onsub">保存</el-button>
35
+          <el-button type="primary" @click="onsub">提交工单</el-button>
36
         </el-form-item>
36
         </el-form-item>
37
       </el-col>
37
       </el-col>
38
     </el-form>
38
     </el-form>