1

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

@@ -151,7 +151,7 @@
           <el-button
             type="primary"
             @click="submitForm('ruleForm')"
-          >保存</el-button
+          >提交工单</el-button
           >
         </el-form-item>
       </el-row>
@@ -210,7 +210,7 @@ export default {
         pid: 3000
       },
       cid: '',
-      usercodeSearch: '',
+      usercodeSearch: window.localStorage.getItem('storageUsercode'),
       orderarr: [],
       isedit: false,
       ordertypeArr: [],
@@ -340,6 +340,7 @@ export default {
       this.ruleForm.repairmanphone = this.$store.getters.mobile
       this.ruleForm.repairmanCallNumber = this.$store.getters.mobile
     }
+    this.getUserData()
   },
   methods: {
     getUserData() {

CallCenterWeb.UI/RMYY/src/components/workOrder/vehicleDispatch/addOrEdit.vue

@@ -94,8 +94,8 @@
           </el-col>
         </el-row>
         <el-form-item>
-          <el-button type="primary" @click="submitForm">保存</el-button>
-          <el-button @click="resetForm">重置</el-button>
+          <el-button type="primary" @click="submitForm">提交工单</el-button>
+          <!-- <el-button @click="resetForm">重置</el-button> -->
         </el-form-item>
       </el-col>
     </el-form>
@@ -269,7 +269,7 @@
           type2Arr: []
         },
         deptid: [],
-        usercodeSearch: '',
+        usercodeSearch: window.localStorage.getItem('storageUsercode'),
         loading: false
       }
     },
@@ -306,6 +306,7 @@
         this.ruleForm.needman = this.$store.getters.usercode
         this.ruleForm.phon = this.$store.getters.mobile
       }
+      this.getUserData()
     },
     methods: {
       getUserData() {

CallCenterWeb.UI/RMYY/src/views/callScreen/components/OrderList.vue

@@ -128,7 +128,7 @@ export default {
             } // props
           },
           area: ['80%', '90%'],
-          title: '订单详情'
+          title: '工单详情'
         })
       }
       if (row.F_Type == 1000) {
@@ -141,7 +141,7 @@ export default {
             } // props
           },
           area: ['80%', '90%'],
-          title: '订单详情'
+          title: '工单详情'
         })
       }
       if (row.F_Type === 2000) {

CallCenterWeb.UI/RMYY/src/views/callScreen/components/drugList.vue

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

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

@@ -390,7 +390,7 @@
             } // props
           },
           area: ['80%', '90%'],
-          title: '订单详情'
+          title: '详情'
         })
       },
       //删除

CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue

@@ -55,6 +55,10 @@
                 <th>-</th>
               </tr>
               <tr>
+                <th>紧急情况:</th>
+                <td colspan="5">{{ orderDetailData.F_EmergencyTypes }}</td>
+              </tr>
+              <tr>
                 <th>工单内容:</th>
                 <td colspan="5">{{ orderDetailData.F_Content }}</td>
               </tr>

CallCenterWeb.UI/RMYY/src/views/comDispatch/components/distributionList.vue

@@ -151,7 +151,7 @@ export default {
           data: { rowid: ordercode } // props
         },
         area: ['80%', '90%'],
-        title: '订单详情'
+        title: '工单详情'
       })
     },
     // 转派工单

CallCenterWeb.UI/RMYY/src/views/comDispatch/ebcomponents/ebTabList.vue

@@ -374,7 +374,7 @@
             } // props
           },
           area: ['80%', '90%'],
-          title: '订单详情'
+          title: '详情'
         })
       },
       //删除

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

@@ -860,7 +860,7 @@ export default {
           } // props
         },
         area: ['80%', '90%'],
-        title: '订单详情'
+        title: '工单详情'
       })
     },
     isShowButton(row, key) {
@@ -1152,6 +1152,7 @@ export default {
             type: 'success',
             message: '挂起成功!'
           })
+          this.dialogHangUp = false
           this.getListTask()
         }
       })

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

@@ -86,6 +86,10 @@
                 </td>
               </tr>
               <tr>
+                <th>紧急情况:</th>
+                <td colspan="5">{{ orderDetailData.F_EmergencyTypes }}</td>
+              </tr>
+              <tr>
                 <th>工单内容:</th>
                 <td colspan="5">{{ orderDetailData.F_WorkOrderContents }}</td>
               </tr>

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

@@ -55,6 +55,10 @@
                 <td>{{ orderDetailData.F_Birth=='0'?'否':'是' }}</td>
               </tr>
               <tr>
+                <th>紧急情况:</th>
+                <td colspan="5">{{ orderDetailData.F_EmergencyTypes }}</td>
+              </tr>
+              <tr>
                 <th>工单内容:</th>
                 <td colspan="5">{{ orderDetailData.F_Content }}</td>
               </tr>

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

@@ -44,7 +44,11 @@
                 <th>报修地点:</th>
                 <td colspan="3">{{ orderDetailData.F_PlaceOfRepair }}</td>
                 <th>提交人:</th>
-                <td>{{ orderDetailData.F_CreateUser }}</td>
+                <td>{{ orderDetailData.applicantname }}</td>
+              </tr>
+              <tr>
+                <th>紧急情况:</th>
+                <td colspan="5">{{ orderDetailData.F_EmergencyTypes }}</td>
               </tr>
               <tr>
                 <th>工单内容:</th>
@@ -87,7 +91,7 @@
                       <th>完成情况:</th>
                       <td>{{ repairList[0] ? repairList[0].dealtype : '-' }}</td>
                       <th>异常原因:</th>
-                      <td>{{ repairList[0] ? repairList[0].F_ReturnReason : '-' }}</td>
+                      <td>{{ repairList[0] ? repairList[0].F_ExceptionType : '-' }}</td>
                       <th>有无耗材:</th>
                       <td>{{ (repairList[0] && repairList[0].F_IsInvolvedEquip) ? '有' : '无' }}</td>
                     </tr>

CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/index.vue

@@ -483,7 +483,7 @@ export default {
             } // props
           },
           area: ['80%', '90%'],
-          title: '订单详情'
+          title: '工单详情'
         })
       }
       if (row.F_Type === 1000) {

CallCenterWeb.UI/RMYY/src/views/orderManage/orderList/index.vue

@@ -396,7 +396,7 @@ export default {
             } // props
           },
           area: ['80%', '90%'],
-          title: '订单详情'
+          title: '工单详情'
         })
       }
       if (row.F_Type === 1000) {
@@ -409,7 +409,7 @@ export default {
             } // props
           },
           area: ['80%', '90%'],
-          title: '订单详情'
+          title: '工单详情'
         })
       }
       if (row.F_Type === 2000) {
@@ -422,7 +422,7 @@ export default {
             } // props
           },
           area: ['80%', '90%'],
-          title: '订单详情'
+          title: '工单详情'
         })
       }
     },

CallCenterWeb.UI/RMYY/src/views/orderManage/patientVisit/visit.vue

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

CallCenterWeb.UI/RMYY/src/views/trafficData/callRecord/index.vue

@@ -86,7 +86,6 @@
         align="center"
       >
         <template slot-scope="scope">
-          <span>{{ scope.row.CallNumber }}</span>
           <i
             v-if="scope.row.CallState == 0"
             class="el-icon-mobile"
@@ -94,11 +93,12 @@
               color: #24c6c8;
               font-size: 20px;
               vertical-align: middle;
-              margin-left: 5px;
+              margin-right: 5px;
               cursor: pointer;
             "
             @click="oncall(scope.row, scope.$index)"
           />
+          <span>{{ scope.row.CallNumber }}</span>
         </template>
       </el-table-column>
       <el-table-column

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

@@ -43,7 +43,7 @@
         </el-col>
       </el-row>
       <el-form-item>
-        <el-button type="primary" @click="submitForm">保存</el-button>
+        <el-button type="primary" @click="submitForm">提交</el-button>
         <!-- <el-button @click="resetForm">重置</el-button> -->
       </el-form-item>
     </el-form>

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

@@ -88,8 +88,8 @@
           </el-col>
         </el-row>
         <el-form-item>
-          <el-button type="primary" @click="submitForm">保存</el-button>
-          <el-button @click="resetForm">重置</el-button>
+          <el-button type="primary" @click="submitForm">提交工单</el-button>
+          <!-- <el-button @click="resetForm">重置</el-button> -->
         </el-form-item>
       </el-col>
     </el-form>

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

@@ -37,8 +37,8 @@
           </el-col>
         </el-row>
         <el-form-item>
-          <el-button @click="resetForm">取 消</el-button>
-          <el-button type="primary" @click="sureAssign()">确 定</el-button>
+          <!-- <el-button @click="resetForm">取 消</el-button> -->
+          <el-button type="primary" @click="sureAssign()">提交</el-button>
         </el-form-item>
       </el-col>
     </el-form>

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

@@ -32,7 +32,7 @@
           </el-col>
         </el-row>
         <el-form-item>
-          <el-button type="primary" @click="onsub">保存</el-button>
+          <el-button type="primary" @click="onsub">提交工单</el-button>
         </el-form-item>
       </el-col>
     </el-form>