Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/src/utils/codeMap.js

@@ -2,5 +2,7 @@ export default{
     //排队叫号字典
     "queueState":{"0":"排队中","1":"办理中","4":"接待结束"},
     "takeNumWay":{"0":"现场取号","1":"在线取号"},
+    "wy_signin":{"0":"现场取号","1":"在线取号"},
+    "register_type":{"Applets":"小程序","wechat":"公众号","app":"自助服务终端"},
     "politicalStatus":{"0":"中共党员","1":"中共预备党员","2":"共青团员","3":"普通居民","4":"其它"}
 }
\ No newline at end of file

portal-manager-ui/admin/src/views/dataAdmin/components/Impossible/index.vue

@@ -5,8 +5,8 @@
 				<a-button :loading="btnLoading" type="success" @click="handleExportTable">
 					<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
 				</a-button>
-				<div class="ml20">提交次数：{{ numObj ? numObj.count : 0 }}次</div>
-				<div class="ml20">回复次数：{{ numObj ? numObj.reply_count : 0 }}次</div>
+				<div class="ml20">提交总次数：{{ numObj ? numObj.count : 0 }}次</div>
+				<div class="ml20">回复总次数：{{ numObj ? numObj.reply_count : 0 }}次</div>
 			</div>
 			<a-form :model="queryform" layout="inline">
 				<a-form-item>

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/components/HandlingDetails.vue

 <template>
   <div class="handling" ref="handling">
-    <a-drawer
-      :destroyOnClose="true"
-      :title="modalInfo.title"
-      :width="modalInfo.width"
-      :visible="modalInfo.visible"
-      @close="modalClose"
-      @getContainer="() => $refs.handling"
-    >
+    <a-drawer :destroyOnClose="true" :title="modalInfo.title" :width="modalInfo.width" :visible="modalInfo.visible"
+      @close="modalClose" @getContainer="() => $refs.handling">
       <div class="headerInfo">
         <!-- 头部耗时部分 -->
         <p>
-          <span
-            >总耗时：{{ dataList.alltime || "--" }}
-            <i
-              v-show="
-                dataList.alltime &&
+          <span>总耗时：{{ dataList.alltime || "--" }}
+            <i v-show="dataList.alltime &&
               compareTime(dataList.p_alltime, dataList.alltime)
-              "
-              class="fa fa-long-arrow-down"
-            ></i>
+              " class="fa fa-long-arrow-down"></i>
           </span>
-          <span
-            >等待时间：{{ dataList.waittime || "--" }}
-            <i
-              v-show="
-                dataList.waittime &&
+          <span>等待时间：{{ dataList.waittime || "--" }}
+            <i v-show="dataList.waittime &&
               compareTime(dataList.p_waittime, dataList.waittime)
-              "
-              class="fa fa-long-arrow-down"
-            ></i>
+              " class="fa fa-long-arrow-down"></i>
           </span>
-          <span
-            >办理时间：{{ dataList.bltime || "--" }}
-            <i
-              v-show="
-                dataList.bltime &&
+          <span>办理时间：{{ dataList.bltime || "--" }}
+            <i v-show="dataList.bltime &&
               compareTime(dataList.p_bltime, dataList.bltime)
-              "
-              class="fa fa-long-arrow-down"
-            ></i>
+              " class="fa fa-long-arrow-down"></i>
           </span>
         </p>
         <p>
@@ -49,12 +28,7 @@
         </p>
       </div>
       <div :class="returnScolor">{{ $codeMap.queueState[dataList.style] }}</div>
-      <a-steps
-        direction="vertical"
-        size="small"
-        :current="approveLs.length"
-        class="steps_box"
-      >
+      <a-steps direction="vertical" size="small" :current="approveLs.length" class="steps_box">
         <a-step :disabled="true" class="step_box">
           <div class="icon_box" slot="icon"></div>
           <div class="title_box" slot="title">
@@ -62,27 +36,12 @@
           </div>
           <div class="description_box" slot="description">
             <div class="details">
-              <span
-                ><i class="lable">申报人：</i
-                >{{ dataList.people_name || "--" }}</span
-              >
-              <span
-                ><i class="lable">取号时间：</i
-                >{{ dataList.taketime || "--" }}</span
-              >
-              <span
-                ><i class="lable">排队编码：</i
-                >{{ dataList.flownum || "--" }}</span
-              >
-              <span
-                ><i class="lable">取号方式：</i
-                >{{ $codeMap.takeNumWay[dataList.wy_signin] || "--" }}</span
-              >
-              <span><i class="lable">注册方式：</i>{{ "--" }}</span>
-              <span
-                ><i class="lable">取号设备：</i
-                >{{ dataList.take_name || "--" }}</span
-              >
+              <span><i class="lable">申报人：</i>{{ dataList.people_name || "--" }}</span>
+              <span><i class="lable">取号时间：</i>{{ dataList.taketime || "--" }}</span>
+              <span><i class="lable">排队编码：</i>{{ dataList.flownum || "--" }}</span>
+              <span><i class="lable">取号方式：</i>{{ dataList.wy_signin === 0 ? '现场取号' : '在线取号' || "--" }}</span>
+              <span><i class="lable">注册方式：</i>{{ $codeMap.register_type[dataList.register_type] || "--" }}</span>
+              <span><i class="lable">取号设备：</i>{{ dataList.take_name || "--" }}</span>
             </div>
           </div>
         </a-step>
@@ -93,22 +52,10 @@
           </div>
           <div class="description_box" slot="description">
             <div class="details">
-              <span
-                ><i class="lable">办理窗口：</i
-                >{{ dataList.window_name || "--" }}</span
-              >
-              <span
-                ><i class="lable">办理开始时间：</i
-                >{{ dataList.calltime || "--" }}</span
-              >
-              <span
-                ><i class="lable">工作人员：</i
-                >{{ dataList.workman_name || "--" }}</span
-              >
-              <span
-                ><i class="lable">叫号设备：</i
-                >{{ dataList.call_name || "--" }}</span
-              >
+              <span><i class="lable">办理窗口：</i>{{ dataList.window_name || "--" }}</span>
+              <span><i class="lable">办理开始时间：</i>{{ dataList.calltime || "--" }}</span>
+              <span><i class="lable">工作人员：</i>{{ dataList.workman_name || "--" }}</span>
+              <span><i class="lable">叫号设备：</i>{{ dataList.call_name || "--" }}</span>
             </div>
           </div>
         </a-step>
@@ -119,10 +66,7 @@
           </div>
           <div class="description_box" slot="description">
             <div class="details">
-              <span
-                ><i class="lable">办理结束时间：</i
-                >{{ dataList.endtime || "--" }}</span
-              >
+              <span><i class="lable">办理结束时间：</i>{{ dataList.endtime || "--" }}</span>
             </div>
           </div>
         </a-step>
@@ -176,7 +120,7 @@ export default {
       }
     },
   },
-  mounted() {},
+  mounted() { },
 
   methods: {
     modalClose() {
@@ -375,7 +319,7 @@ export default {
 }
 
 /deep/.ant-steps-item {
-  & + .ant-steps-item {
+  &+.ant-steps-item {
     margin-top: 25px !important;
   }
 }