2.20

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

@@ -1457,7 +1457,7 @@
         this.wocode = code;
         this.fid = row.F_ID;
         this.rowdata = row;
-        this.worktypeInfo = this.$store.getters.workTypeMap[parseInt(row.F_SonType || row.F_WorkOrderCategory)].tag
+        this.worktypeInfo = this.$store.getters.workTypeMap[parseInt(row.F_SonType || row.F_WorkOrderCategory || row.F_type2)].tag
         console.log(name, "name",row.F_SonType,row.F_WorkOrderCategory,this.worktypeInfo);
         console.log(this.getNowDate());
         if (name === "dispatch_zhuantongshi") {
@@ -1921,9 +1921,9 @@
             return;
           }
           if (
-            this.evaluateForm.Attitude < 3 ||
-            this.evaluateForm.Quality < 3 ||
-            this.evaluateForm.Efficiency < 3
+            this.evaluateForm.Attitude <= 3 ||
+            this.evaluateForm.Quality <= 3 ||
+            this.evaluateForm.Efficiency <= 3
           ) {
             if (this.evaluateForm.EvaluateContent === "") {
               this.$message.warning("请输入文字评价");
@@ -1940,9 +1940,9 @@
             return;
           }
           if (
-            this.schedulingEvaluateForm.Attitude < 3 ||
-            this.schedulingEvaluateForm.Quality < 3 ||
-            this.schedulingEvaluateForm.Efficiency < 3
+            this.schedulingEvaluateForm.Attitude <= 3 ||
+            this.schedulingEvaluateForm.Quality <= 3 ||
+            this.schedulingEvaluateForm.Efficiency <= 3
           ) {
             if (this.schedulingEvaluateForm.EvaluateContent === "") {
               this.$message.warning("请输入文字评价");
@@ -1959,9 +1959,9 @@
             return;
           }
           if (
-            this.carEvaluteForm.Attitude < 3 ||
-            this.carEvaluteForm.Quality < 3 ||
-            this.carEvaluteForm.Efficiency < 3
+            this.carEvaluteForm.Attitude <= 3 ||
+            this.carEvaluteForm.Quality <= 3 ||
+            this.carEvaluteForm.Efficiency <= 3
           ) {
             if (this.carEvaluteForm.Evaluation === "") {
               this.$message.warning("请输入文字评价");
@@ -1978,8 +1978,8 @@
               this.loading = false // 关闭loading
               return;
             }
-            if (this.consumablesConfirmForm.Attitude < 3 || this.consumablesConfirmForm.Quality < 3 || this
-              .consumablesConfirmForm.Efficiency < 3) {
+            if (this.consumablesConfirmForm.Attitude <= 3 || this.consumablesConfirmForm.Quality <= 3 || this
+              .consumablesConfirmForm.Efficiency <= 3) {
               if (this.consumablesConfirmForm.EvaluateContent === "") {
                 this.$message.warning("请输入文字评价");
                 this.loading = false // 关闭loading

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

@@ -1594,6 +1594,8 @@ export default {
               })
               .catch(() => {})
           }
+        }else{
+          this.isDisabledBtn = false
         }
       })
     }

CallCenterWeb.UI/RMYY/src/views/leadConcernNew/qualityControl/index.vue

@@ -2,8 +2,8 @@
   <div class="app-container">
     <el-form :inline="true" :model="ruleForm" class="demo-form-inline">
       <el-form-item label="日期">
-        <el-date-picker v-model="startTime" size="medium" type="date" format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
+        <el-date-picker v-model="startTime" size="medium" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+          placeholder="选择日期"></el-date-picker>
         <!-- <el-date-picker
           v-model="startTime"
           size="medium"
@@ -63,6 +63,7 @@
 <script>
   import {
     getNowDate,
+    getPreDate,
     exportExcel,
     getFirstDayInCurrentMonth
   } from "@/utils";
@@ -78,8 +79,38 @@
     data() {
       return {
         selectVal: "0",
-        cardData: [],
-        startTime: getNowDate(),
+        cardData: [{
+            text: "工单超时接单",
+            value: 0,
+            per: 0
+          },
+          {
+            text: "工单超时提交",
+            value: 0,
+            per: 0
+          },
+          {
+            text: "紧急工单超时接单",
+            value: 0,
+            per: 0
+          },
+          {
+            text: "紧急工单超时提交",
+            value: 0,
+            per: 0
+          },
+          {
+            text: "工单返修",
+            value: 0,
+            per: 0
+          },
+          {
+            text: "工单不满意",
+            value: 0,
+            per: 0
+          },
+        ],
+        startTime: getPreDate(3600 * 1000 * 24),
         ruleForm: {},
         activeName: "first",
       };
@@ -166,6 +197,9 @@
         }
         GetList(params).then(res => {
           if (res.state == 'success') {
+            if(res.data.length == 0){
+              return
+            }
             const data = res.data[0]
             this.cardData = [{
                 text: "工单超时接单",
@@ -194,7 +228,7 @@
               },
               {
                 text: "工单不满意",
-                value: data.unsatisfactory_num,
+                value: data.unsatisfactory_num || 0,
                 per: 0
               },
             ]

CallCenterWeb.UI/RMYY/src/views/leadConcernNew/workloadReport/index.vue

@@ -67,26 +67,27 @@
           <tr>
             <td colspan="3">工单接单及时率</td>
             <td>{{ "-" }}</td>
-            <td colspan="3">工单平均提交时长(软件)</td>
-            <td colspan="2">{{ tableData.avg_software_complete_time }}</td>
+            <td colspan="3">工单平均提交时长(软件)/分</td>
+            <td colspan="2">{{ (tableData.avg_software_complete_time/60000).toFixed(2) }}</td>
           </tr>
           <tr>
-            <td colspan="3">普通工单平均接单时长</td>
-            <td>{{ tableData.avg_accept_time }}</td>
-            <td colspan="3">工单平均提交时长(硬件)</td>
-            <td colspan="2">{{ tableData.avg_hardware_complete_time }}</td>
+            <td colspan="3">普通工单平均接单时长(分)</td>
+            <td>{{ (tableData.avg_accept_time/60000).toFixed(2) }}</td>
+            <td colspan="3">工单平均提交时长(硬件)/分</td>
+            <td colspan="2">{{ (tableData.avg_hardware_complete_time/60000).toFixed(2) }}</td>
           </tr>
           <tr>
-            <td colspan="3">紧急工单平均接单时长</td>
-            <td>{{ tableData.avg_emergency_accept_time }}</td>
+            <td colspan="3">紧急工单平均接单时长(分)</td>
+            <td>{{ (tableData.avg_emergency_accept_time/60000).toFixed(2) }}</td>
             <td colspan="3">工单提交及时率</td>
             <td colspan="2">{{ "-" }}</td>
           </tr>
           <tr>
             <td colspan="3">无转派工单提交率</td>
-            <td>{{ tableData.no_transfer_rate }}</td>
-            <td colspan="3">紧急工单提交平均时长</td>
-            <td colspan="2">{{ tableData.avg_emergency_time }}</td>
+            <td v-if="tableData.no_transfer_rate">{{ (tableData.no_transfer_rate) * 100 }}%</td>
+            <td v-if="!tableData.no_transfer_rate">{{ "0" }}</td>
+            <td colspan="3">紧急工单提交平均时长(分)</td>
+            <td colspan="2">{{ (tableData.avg_emergency_time/60000).toFixed(2) }}</td>
           </tr>
           <!-- 重点关注工单 -->
           <tr>
@@ -110,6 +111,7 @@
 <script>
   import {
     getNowDate,
+    getPreDate,
     exportExcel,
     getFirstDayInCurrentMonth
   } from "@/utils";
@@ -120,7 +122,7 @@
     data() {
       return {
         selectVal:"0",
-        startTime: getNowDate(),
+        startTime: getPreDate(3600 * 1000 * 24),
         tableData:{},
         ruleForm: {},
         activeName: "first",
@@ -192,6 +194,13 @@
           },
           tooltip: {
             trigger: "axis",
+            formatter(params) {
+              let str = params[0].name + '<br />'
+              params.forEach(item => {
+                str += `${item.marker}${item.seriesName}: ${item.data}%<br />`
+              })
+              return "<div style='color:#fff'>" + str + "</div>"
+            }
           },
           legend: {
             data: ["工单接单及时率", "无转派工单提交率","工单提交及时率"],
@@ -387,7 +396,7 @@
           if(res.state == 'success'){
             if(res.data.length>0){
               this.tableData = res.data[0]
-            }         
+            }
           }
         })
         //图表
@@ -435,15 +444,15 @@
               }
 
               echattwoVal1.push("0")//工单接单及时率
-              echattwoVal2.push(ele.no_transfer_rate)//无转派工单提交率
+              echattwoVal2.push((ele.no_transfer_rate || 0).toFixed(4) * 100)//无转派工单提交率
               echattwoVal3.push("0")//工单提交及时率
 
-              echartThree1.push(ele.avg_accept_time)
-              echartThree2.push(ele.avg_emergency_accept_time)
+              echartThree1.push((ele.avg_accept_time/60000).toFixed(2))
+              echartThree2.push((ele.avg_emergency_accept_time/60000).toFixed(2))
 
-              echartFour1.push(ele.avg_hardware_complete_time)
-              echartFour2.push(ele.avg_software_complete_time)
-              echartFour3.push(ele.avg_emergency_time)
+              echartFour1.push((ele.avg_hardware_complete_time/60000).toFixed(2))
+              echartFour2.push((ele.avg_software_complete_time/60000).toFixed(2))
+              echartFour3.push((ele.avg_emergency_time/60000).toFixed(2))
 
               echartFive1.push(ele.urge_num)
               echartFive2.push(ele.emergency_num)

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

@@ -526,8 +526,8 @@
             this.$message.warning("请选择星级评价");
             return;
           }
-          if (this.consumablesConfirmForm.Attitude < 3 || this.consumablesConfirmForm.Quality < 3 || this
-            .consumablesConfirmForm.Efficiency < 3) {
+          if (this.consumablesConfirmForm.Attitude <= 3 || this.consumablesConfirmForm.Quality <= 3 || this
+            .consumablesConfirmForm.Efficiency <= 3) {
             if (this.consumablesConfirmForm.EvaluateContent === "") {
               this.$message.warning("请输入文字评价");
               return;

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

@@ -20,7 +20,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select placeholder="请选择所属医院" size="medium" v-model="ruleForm.ssyy" filterable clearable>
+        <el-select placeholder="请选择医联体单位" size="medium" v-model="ruleForm.ssyy" filterable clearable>
           <el-option v-for="(item,index) in coperDataLists" :key="index" :value="item.F_YqName" :label="item.F_YqName"></el-option>
         </el-select>
       </el-form-item>
@@ -72,7 +72,7 @@
       <el-table-column prop="F_WorkOrderContents" label="就诊需求" align="center" min-width />
       <el-table-column prop="F_Customer" label="姓名" align="center" min-width />
       <el-table-column prop="F_Phon" label="联系电话" align="center" min-width />
-      <el-table-column prop="F_ssyy" label="所属医院" align="center" min-width />
+      <el-table-column prop="F_ssyy" label="医联体单位" align="center" min-width />
       <el-table-column prop="F_FullName" label="患者姓名" align="center" min-width />
       <el-table-column prop="F_hzdh" label="患者电话" align="center" min-width />
       <el-table-column prop="F_nl" label="年龄" align="center" min-width />
@@ -150,9 +150,18 @@
         </template>
       </el-table-column>
       <el-table-column prop="F_CreateTime" label="创建时间" align="center" min-width />
+      <el-table-column label="操作" align="center" class-name="oparate_btn">
+        <template slot-scope="scope">
+          <el-button v-for="item in scope.row.Buttons" :key="item.key" type="text"
+            @click="btnClickEvents(item, scope.row.F_WorkOrderCode, scope.row)">
+            {{ item.value }}
+          </el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex"
       :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" />
+    <order-button-operation ref="butOption" @refList="refList" />
   </div>
 </template>
 
@@ -160,21 +169,27 @@
   import Pagination from "@/components/context/Pagination"; // 对el-pagination 二次封装
   import { getCooperateList,getListyqRepairlist } from "@/api/systemSetup/roleSetting/hospitalArea";
   import askDetail from "../components/askdetail.vue";
+  import addOrEditOrder from "../../callScreen/components/AddOrEditOrder.vue";
+  import OrderButtonOperation from "@/components/button/orderList";
   import {
     getGongDanType,
     GetAllSZList,
     getGetSZListExport,
   } from "@/api/orderManagement/patientvisit";
   import {
+    getNowDate,
+    getPreDate,
     exportExcel
   } from "@/utils";
   export default {
     name: "doubleList",
     components: {
       Pagination,
+      OrderButtonOperation
     },
     data() {
       return {
+        buttonName: "",
         dataLists: [],
         hospitalDataLists:[],
         coperDataLists:[],
@@ -194,7 +209,10 @@
         ruleForm: {
           keywords: "",
           code:"",
-          searchTime: "",
+          searchTime:  [
+            getPreDate(3600 * 1000 * 24) + " 17:00:00",
+            getNowDate() + " 17:00:00",
+          ],
           jzyq: "",
           ssyy:"",
           gtqk:"",
@@ -213,6 +231,34 @@
     },
     mounted() {},
     methods: {
+      btnClickEvents(button, wocode, row) {
+        this.buttonName = button.key;
+        this.$refs.butOption.butOptionMethod(this.buttonName, wocode, row);
+        if (this.buttonName === "yw_bianji") {
+          this.btn_edit(wocode, row.F_type1, row.F_type2);
+        }
+      },
+      // 编辑
+      btn_edit(rid, rtype, r2type) {
+        this.$layer.iframe({
+          content: {
+            content: addOrEditOrder, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+              wid: rid,
+              rtype: rtype.toString(),
+              r2type: r2type.toString(),
+              iswomanage: "2",
+              isedit: "1",
+            }, // props
+          },
+          area: ["70%", "70%"],
+          title: "编辑工单",
+        });
+      },
+      refList() {
+        this.getList();
+      },
       // 搜索
       btn_search_task() {
         this.getList();

CallCenterWeb.UI/RMYYAPP/App.vue

@@ -6,7 +6,7 @@
 		},
 		onShow: function() {
 			console.log('App Show')
-			// this.init()//判断是不是钉钉环境
+			this.init()//判断是不是钉钉环境
 		},
 		onHide: function() {
 			console.log('App Hide')

CallCenterWeb.UI/RMYYAPP/manifest.json

@@ -2,8 +2,8 @@
     "name" : "郑州人民医院综合服务保障调度平台",
     "appid" : "__UNI__5A5207D",
     "description" : "",
-    "versionName" : "1.2.75",
-    "versionCode" : 175,
+    "versionName" : "1.2.76",
+    "versionCode" : 176,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

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

@@ -160,7 +160,7 @@
 			if (uni.getStorageSync("roleCode") === "APRY") {
 				uni.hideTabBar()
 			}
-			if (uni.getStorageSync("roleCode") === "GLY") {
+			if (uni.getStorageSync("roleCode") === "BMZG" || uni.getStorageSync("roleCode") === "WXBZZ") {
 				this.isgly = 1
 			}
 			if (uni.getStorageSync("isAllow") === "1") {

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

@@ -29,6 +29,7 @@
 									</view>
 									<view class="textState" style="color: red;border: red;margin-top: 0;" v-show="item.F_EmergencyTypes=='紧急'">{{ item.F_EmergencyTypes }}</view>
 								</view>
+								<view class="uni-note">申请人：{{item.F_ProposerName}}-{{ item.F_Proposer }}</view>
 								<view class="uni-note" v-show="item.F_ProposerDept">上报科室：{{ $mHelper.findParents(departList,item.F_ProposerDept)}}
 								</view>
 								<view class="uni-note">上报时间：{{item.F_CreateTime}}</view>

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

@@ -149,7 +149,7 @@
 						this.disabledButton = false
 						return
 					}
-					if (this.valiFormData.attitude < 3 || this.valiFormData.quality < 3 || this.valiFormData.finishTime < 3) {
+					if (this.valiFormData.attitude <= 3 || this.valiFormData.quality <= 3 || this.valiFormData.finishTime <= 3) {
 						if (!this.valiFormData.content) {
 							this.$mHelper.toast('请输入评价内容')
 							this.disabledButton = false

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

@@ -139,14 +139,15 @@
 					this.disabledButton = false
 					return
 				}
-				if (this.stateType == 0 && (this.valiFormData.attitude < 3 || this.valiFormData.quality < 3 || this
-						.valiFormData.finishTime < 3)) {
+				if (this.stateType == 0 && (this.valiFormData.attitude <= 3 || this.valiFormData.quality <= 3 || this
+						.valiFormData.finishTime <= 3)) {
 					if (!this.valiFormData.content) {
 						this.$mHelper.toast('请输入评价内容')
 						this.disabledButton = false
 						return
 					}
-				} else if (this.stateType == 1 && this.valiFormData.attitude < 3) {
+				} else if (this.stateType == 1 && (this.valiFormData.attitude <= 3 || this.valiFormData.quality <= 3 || this
+						.valiFormData.finishTime <= 3)) {
 					if (!this.valiFormData.content) {
 						this.$mHelper.toast('请输入评价内容')
 						this.disabledButton = false

CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/components/vehiccleDetail/evaluateDetail/evaluateDetail.vue

@@ -64,7 +64,7 @@
 					this.$mHelper.toast('请选择星级评价')
 					return
 				}
-				if(this.valiFormData.attitude < 3 || this.valiFormData.quality < 3 || this.valiFormData.finishTime < 3) {
+				if(this.valiFormData.attitude <= 3 || this.valiFormData.quality <= 3 || this.valiFormData.finishTime <= 3) {
 					if(!this.valiFormData.content) {
 						this.disabledButton = false
 						this.$mHelper.toast('请输入评价内容')

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

@@ -506,7 +506,7 @@
 						this.disabledButton = false
 						return
 					}
-					if (this.valiFormData.attitude < 3 || this.valiFormData.quality < 3 || this.valiFormData.finishTime < 3) {
+					if (this.valiFormData.attitude <= 3 || this.valiFormData.quality <= 3 || this.valiFormData.finishTime <= 3) {
 						if (!this.valiFormData.content) {
 							this.$mHelper.toast('请输入评价内容')
 							this.disabledButton = false

CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/f66b4650-591e-11ee-a489-ab700969ec68
+https://ide.dcloud.net.cn/build/download/6db1bbf0-5cff-11ee-b53a-eba4065edcc8

CallCenterWeb.UI/rmyyechartsNew/src/components/conversationByNow.vue

@@ -365,8 +365,8 @@
 									show: true,
 									formatter: '总院',
 									color: '#fff',
-									fontSize: 14,
-									position: 'top'
+									fontSize: 12,
+									position: 'bottom'
 								}
 							},
 							{
@@ -380,8 +380,8 @@
 									show: true,
 									formatter: '郑东院区',
 									color: '#fff',
-									fontSize: 14,
-									position: 'top'
+									fontSize: 12,
+									position: 'bottom'
 								}
 							},
 							{
@@ -395,8 +395,8 @@
 									show: true,
 									formatter: '南部院区',
 									color: '#fff',
-									fontSize: 14,
-									position: 'top'
+									fontSize: 12,
+									position: 'bottom'
 								}
 							},
 							{
@@ -410,8 +410,8 @@
 									show: true,
 									formatter: '北院区',
 									color: '#fff',
-									fontSize: 14,
-									position: 'top'
+									fontSize: 12,
+									position: 'bottom'
 								}
 							},
 							{
@@ -425,8 +425,8 @@
 									show: true,
 									formatter: '紫宸社区',
 									color: '#fff',
-									fontSize: 14,
-									position: 'top'
+									fontSize: 12,
+									position: 'bottom'
 								}
 							},
 							{
@@ -440,8 +440,8 @@
 									show: true,
 									formatter: '北林社区',
 									color: '#fff',
-									fontSize: 14,
-									position: 'top'
+									fontSize: 12,
+									position: 'bottom'
 								}
 							},
 						]