Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/appmarket/components/AppDetailsPage.vue

@@ -192,7 +192,6 @@ export default {
       let res = await getAppInfo({ id: this.appId });
       if (res.data.code === 1) {
         this.appInfo = res.data.data;
-        console.log(this.appInfo);
       }
     },
     // 获取历史版本

base-manager-ui/admin/src/pages/basicset/appmarket/components/FieldConfig.vue

@@ -152,7 +152,9 @@ export default {
           this.current -= 1;
           this.getTempleteList();
         }
-        this.tableData = data;
+        this.tableData = data.sort((a, b) => {
+          return a.fieldOrderNo - b.fieldOrderNo;
+        });
         this.SET_appTemplate(data);
         this.total = total;
       }

base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddField.vue

@@ -111,7 +111,7 @@ export default {
         fieldLen: 128, //数据长度，默认128
         fieldNull: "", //是否允许为空，(0.否,1.是)
         isList: "", //字段是否列表显示(0.否,1.是)
-        fieldOrderNo: "", //	排序号
+        fieldOrderNo: 99, //	排序号
         remark: "", //
       },
       rules: {
@@ -166,7 +166,6 @@ export default {
       Object.assign(this.form, this.$options.data().form);
       this.form.appId = this.$route.query.id;
       this.form.id && this.$delete(this.form, "id");
-      console.log(this.form);
     },
     // 编辑
     onEdit(data) {

portal-manager-ui/admin/src/components/viewport/viewport.vue

@@ -11,11 +11,5 @@
   // overflow-y: auto;
   // overflow-x: hidden;
   box-sizing: border-box !important;
-  background-image: linear-gradient(
-    to top,
-    #fad0c4 0%,
-    #fad0c4 1%,
-    #ffd1ff 100%
-  ) !important;
 }
 </style>

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

@@ -48,7 +48,7 @@
                 <span><i class="lable">申报人：</i>{{queEvaData.people_name?queEvaData.people_name:'--'}}</span>
                 <span><i class="lable">取号时间:</i>{{queEvaData.taketime?queEvaData.taketime:'--'}}</span>
                 <span><i class="lable">排队编码：</i>{{queEvaData.flownum?queEvaData.flownum:'--'}}</span>
-                <span><i class="lable">取号方式：</i>{{queEvaData.wy_signin==''?'--':queEvaData.wy_signin>0?'在线取号':'现场取号'}}</span>
+                <span><i class="lable">取号方式：</i>{{queEvaData.wy_signin>0?'在线取号':'现场取号'}}</span>
                 <span><i class="lable">注册方式：</i>--</span>
                 <span><i class="lable">取号设备：</i>{{queEvaData.take_name?queEvaData.take_name:'--'}}</span>
               </div>
@@ -70,7 +70,7 @@
             >
               <div class="details">
                 <span><i class="lable">办理窗口：</i>{{queEvaData.window_name?queEvaData.window_name:'--'}}</span>
-                <span><i class="lable">办理开始时间：</i>{{queEvaData.bltime?queEvaData.bltime:'--'}}</span>
+                <span><i class="lable">办理开始时间：</i>{{queEvaData.calltime?queEvaData.calltime:'--'}}</span>
                 <span><i class="lable">工作人员：</i>{{queEvaData.workman_name?queEvaData.workman_name:'--'}}</span>
                 <span><i class="lable">叫号设备：</i>{{queEvaData.call_name}}</span>
               </div>

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

@@ -2,17 +2,27 @@
   <div class="queueRecord-Container">
     <div class="header_box">
       <div>
-        <a-button :loading="btnLoading" type="success" @click="handleExportTable">
+        <a-button
+          :loading="btnLoading"
+          type="success"
+          @click="handleExportTable"
+        >
           <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
         </a-button>
-        <b>取号次数：<i>{{ tablePagination.total }}</i> 次</b>
+        <b
+          >取号次数：<i>{{ tablePagination.total }}</i> 次</b
+        >
         <sub>统计时间段：{{ searchForm.time[0] }}~{{ searchForm.time[1] }}</sub>
       </div>
       <span>
         <a-space>
           <a-select v-model="searchForm.id" style="width: 120px">
             <a-select-option value=""> 全部设备 </a-select-option>
-            <a-select-option v-for="item in deviceData" :key="item.id" :value="item.id">
+            <a-select-option
+              v-for="item in deviceData"
+              :key="item.id"
+              :value="item.id"
+            >
               {{ item.name }}
             </a-select-option>
           </a-select>
@@ -24,7 +34,10 @@
           </a-select>
           <a-range-picker valueFormat="YYYY-MM-DD" v-model="searchForm.time">
           </a-range-picker>
-          <a-input v-model="searchForm.flownum" placeholder="请输入排队编号搜索">
+          <a-input
+            v-model="searchForm.flownum"
+            placeholder="请输入排队编号搜索"
+          >
             <a-icon slot="prefix" type="search" />
           </a-input>
           <a-button type="primary" @click="handleSearch">搜索</a-button>
@@ -33,11 +46,21 @@
       </span>
     </div>
     <div class="main">
-      <a-table size="small" bordered :row-key="(record) => record.id" :row-selection="{
+      <a-table
+        size="small"
+        bordered
+        :row-key="(record) => record.id"
+        :row-selection="{
           selectedRowKeys: tableSelectedKeys,
           onChange: onSelectChange,
-      }" :scroll="{ y: 590 }" :pagination="tablePagination" @change="changeTablePage" :loading="tableLoading"
-        :columns="tableHeaders" :dataSource="tableList">
+        }"
+        :scroll="{ y: 590 }"
+        :pagination="tablePagination"
+        @change="changeTablePage"
+        :loading="tableLoading"
+        :columns="tableHeaders"
+        :dataSource="tableList"
+      >
         <!-- 序号 -->
         <span slot="num" slot-scope="text, record, index">{{
           (tablePagination.current - 1) * tablePagination.pageSize + index + 1
@@ -59,7 +82,11 @@
         </template>
         <!-- 办理业务 -->
         <template slot="business" slot-scope="text">
-          <a v-if="text.business" @click="openBusiness(text.business, text.businessid)">{{ text.business }}</a>
+          <a
+            v-if="text.business"
+            @click="openBusiness(text.business, text.businessid)"
+            >{{ text.business }}</a
+          >
           <span v-else>--</span>
         </template>
         <!-- 办理开始时间 -->
@@ -91,11 +118,13 @@
         </template>
         <!-- 状态 -->
         <template slot="style" slot-scope="text">
-          <span :class="{
+          <span
+            :class="{
               'stand-line': text.style === 0,
               'on-transact': text.style === 1,
               'on-end': text.style === 4,
-          }">
+            }"
+          >
             {{ $codeMap.queueState[text.style] }}
           </span>
         </template>