Merge remote-tracking branch 'origin/master'

src/views/lotCheck/modules/TaskList.vue

@@ -274,7 +274,7 @@ export default {
         return;
       }
       let taskInfo = this.buildTaskInfo(this.selectionRows[0]);
-        this.$router.push({path: '/lot/check/task/import', query: {id: taskInfo.id}});
+        this.$router.push({path: '/lot/check/task/import', query: {id: taskInfo.id,type:2}});
     },
     // 显示导入页面
     showCheckList(record) {

src/views/smscheck/modules/TaskImport.vue

@@ -189,6 +189,7 @@ export default {
   },
   created() {
     this.task.id = this.$route.query.id;
+    this.type = this.$route.query.type
     this.queryInfoById(this.task.id);
     this.getTask(this.task.id);
   },
@@ -310,6 +311,9 @@ export default {
       this.spinningAdd = true;
       let httpUrl = this.url.importData.replaceAll("taskId", this.task.id);
       let params = this.dataSource;
+      for (let i in params){
+        params[i].type = this.type
+      }
       let method = 'POST';
       let that = this;
       // 发送请求

src/views/smscheck/modules/TaskImportTruck.vue

@@ -86,6 +86,7 @@ export default {
       dataSource: [],
       errorCount: 0,
       task: {},
+      type:null,
       // 表头
       columns: [
         {
@@ -206,6 +207,7 @@ export default {
   },
   created() {
     this.task.id = this.$route.query.id;
+    this.type = this.$route.query.type;
     this.queryInfoById(this.task.id);
 
   },
@@ -305,6 +307,9 @@ export default {
       this.spinningAdd = true;
       let httpUrl = this.url.importData.replaceAll("taskId", this.task.id);
       let params = this.dataSource;
+      for (let i in params){
+        params[i].type = this.type
+      }
       let method = 'POST';
       let that = this;
       // 发送请求

src/views/smscheck/modules/TaskList.vue

@@ -261,7 +261,7 @@
           return;
         }
         let taskInfo = this.buildTaskInfo(this.selectionRows[0]);
-        this.$router.push({ path: '/sms/check/task/import' ,query:{id:taskInfo.id}});
+        this.$router.push({ path: '/sms/check/task/import' ,query:{id:taskInfo.id,type:1}});
       },
       // 显示导入页面
       showCheckList(record) {

src/views/specialApply/TaskUploadData.vue

@@ -158,8 +158,8 @@
                   <a-checkbox value="6">大数据保护停机单停</a-checkbox>
                   <a-checkbox value="7">工信部断卡单停</a-checkbox>
                   <a-checkbox value="8">实人核验未通过关停（单停）</a-checkbox>
-                  <a-checkbox value="999">其他（手动输入名称）</a-checkbox>
-                  <a-input style="width: 300px;left: 10px" v-if="infoModel.shutdownLabel.indexOf('999')"
+                  <a-checkbox value="999">其它（手动输入名称）</a-checkbox>
+                  <a-input style="width: 300px;left: 10px" v-show="infoModel.shutdownLabel.indexOf('999') > -1"
                            v-model:value="infoModel.shutdownLabelOther" placeholder=请输入关停标签名称></a-input>
                 </a-checkbox-group>
               </a-form-model-item>
@@ -171,13 +171,11 @@
           <!--          基础信息稽核结果-->
           <div v-if="rectification">
             <a-form-model-item label="稽核状态" prop="basicCheckState" v-bind="labelCol1">
-              <span
-                :style="{'color':specialResult.basicInfoState == 0 ? 'red' : 'blue'}">{{
-                   specialResult.basicInfoState == '0' ? '未通过' : '通过'
-                }}</span>
+              <a-tag class="font-size-14" v-if="specialResult.basicInfoState == 0" color="#f50">未通过</a-tag>
+              <a-tag class="font-size-14" v-if="specialResult.basicInfoState == 1" color="#2db7f5">通过</a-tag>
             </a-form-model-item>
             <a-form-model-item label="稽核结果" prop="basicCheckNote" v-bind="labelCol1">
-              <span>{{ specialResult.basicInfoNote }}</span>
+              <a-tag class="font-size-14" color="orange">{{ specialResult.basicInfoNote }}</a-tag>
             </a-form-model-item>
           </div>
 
@@ -199,7 +197,8 @@
       </a-steps>
       <a-button v-if="!rectification" @click="stagingAuditLot" style="width: 100%" type="warn">暂存</a-button>
       <div v-if="!batchImproves">
-        <a-button v-if="!detail" @click="submitAuditLot" style="width: 100%;position: relative;top: 10px" type="primary">
+        <a-button v-if="!detail" @click="submitAuditLot" style="width: 100%;position: relative;top: 10px"
+                  type="primary">
           提交申请
         </a-button>
       </div>
@@ -217,14 +216,12 @@
 
         <div v-if="rectification">
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
-            <span
-              :style="{'color':specialResult.nameFindComplianceState == 0 ? 'red' : 'blue'}">{{
-                specialResult.nameFindComplianceState == null ? '未稽核' : specialResult.nameFindComplianceState == '0' ? '未通过' : '通过'
-              }}</span>
+            <a-tag class="font-size-14" v-if="specialResult.nameFindComplianceState == 0" color="#f50">未通过</a-tag>
+            <a-tag class="font-size-14" v-if="specialResult.nameFindComplianceState == 1" color="#2db7f5">通过</a-tag>
           </a-form-model-item>
 
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核结果" prop="basicCheckNote" v-bind="labelCol1Note">
-            <span>{{ specialResult.nameFindComplianceNote }}</span>
+            <a-tag class="font-size-14" color="orange">{{ specialResult.nameFindComplianceNote }}</a-tag>
           </a-form-model-item>
         </div>
 
@@ -352,14 +349,12 @@
       <div>
         <div v-if="rectification">
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
-            <span
-              :style="{'color':specialResult.idCardState == 0 ? 'red' : 'blue'}">{{
-                specialResult.idCardState == null ? '未稽核' : specialResult.idCardState == '0' ? '未通过' : '通过'
-              }}</span>
+            <a-tag class="font-size-14" v-if="specialResult.idCardState == 0" color="#f50">未通过</a-tag>
+            <a-tag class="font-size-14" v-if="specialResult.idCardState == 1" color="#2db7f5">通过</a-tag>
           </a-form-model-item>
 
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核结果" prop="basicCheckNote" v-bind="labelCol1Note">
-            <span>{{ specialResult.idCardNote }}</span>
+            <a-tag class="font-size-14" color="orange">{{ specialResult.idCardNote }}</a-tag>
           </a-form-model-item>
         </div>
 
@@ -482,14 +477,12 @@
       <div>
         <div v-if="rectification">
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
-            <span
-              :style="{'color':specialResult.handCertificateState == 0 ? 'red' : 'blue'}">{{
-                specialResult.handCertificateState == null ? '未稽核' : specialResult.handCertificateState == '0' ? '未通过' : '通过'
-              }}</span>
+            <a-tag class="font-size-14" v-if="specialResult.handCertificateState == 0" color="#f50">未通过</a-tag>
+            <a-tag class="font-size-14" v-if="specialResult.handCertificateState == 1" color="#2db7f5">通过</a-tag>
           </a-form-model-item>
 
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核结果" prop="basicCheckNote" v-bind="labelCol1Note">
-            <span>{{ specialResult.handCertificateNote }}</span>
+            <a-tag class="font-size-14" color="orange">{{ specialResult.handCertificateNote }}</a-tag>
           </a-form-model-item>
         </div>
         <a-form-model-item style="width: 90%;" label="手持身份证半身照片备注：" v-bind="labelCol1Note">
@@ -614,14 +607,12 @@
       <div>
         <div v-if="rectification">
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
-            <span
-              :style="{'color':specialResult.fraudPreventionState == 0 ? 'red' : 'blue'}">{{
-                specialResult.fraudPreventionState == null ? '未稽核' : specialResult.fraudPreventionState == '0' ? '未通过' : '通过'
-              }}</span>
+            <a-tag  class="font-size-14" v-if="specialResult.fraudPreventionState == 0" color="#f50">未通过</a-tag>
+            <a-tag  class="font-size-14" v-if="specialResult.fraudPreventionState == 1" color="#2db7f5">通过</a-tag>
           </a-form-model-item>
 
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核结果" prop="basicCheckNote" v-bind="labelCol1Note">
-            <span>{{ specialResult.fraudPreventionNote }}</span>
+            <a-tag class="font-size-14" color="orange">{{ specialResult.fraudPreventionNote }}</a-tag>
           </a-form-model-item>
         </div>
 
@@ -747,14 +738,12 @@
 
         <div v-if="rectification">
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
-            <span
-              :style="{'color':specialResult.specialReviewFormState == 0 ? 'red' : 'blue'}">{{
-                specialResult.specialReviewFormState == null ? '未稽核' : specialResult.specialReviewFormState == '0' ? '未通过' : '通过'
-              }}</span>
+            <a-tag class="font-size-14" v-if="specialResult.specialReviewFormState == 0" color="#f50">未通过</a-tag>
+            <a-tag class="font-size-14" v-if="specialResult.specialReviewFormState == 1" color="#2db7f5">通过</a-tag>
           </a-form-model-item>
 
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核结果" prop="basicCheckNote" v-bind="labelCol1Note">
-            <span>{{ specialResult.specialReviewFormNote }}</span>
+            <a-tag class="font-size-14" color="orange">{{ specialResult.specialReviewFormNote }}</a-tag>
           </a-form-model-item>
         </div>
         <a-form-model-item style="width: 90%;" label="特审单备注：" v-bind="labelCol1Note">
@@ -877,14 +866,12 @@
       <div>
         <div v-if="rectification">
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
-            <span
-              :style="{'color':specialResult.userCertificateState == 0 ? 'red' : 'blue'}">{{
-                specialResult.userCertificateState == null ? '未稽核' :  specialResult.userCertificateState == '0' ? '未通过' : '通过'
-              }}</span>
+            <a-tag  class="font-size-14"  v-if="specialResult.userCertificateState == 0" color="#f50">未通过</a-tag>
+            <a-tag  class="font-size-14"  v-if="specialResult.userCertificateState == 1" color="#2db7f5">通过</a-tag>
           </a-form-model-item>
 
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核结果" prop="basicCheckNote" v-bind="labelCol1Note">
-            <span>{{ specialResult.userCertificateNote }}</span>
+            <a-tag class="font-size-14" color="orange">{{ specialResult.userCertificateNote }}</a-tag>
           </a-form-model-item>
         </div>
         <a-form-model-item style="width: 90%;" label="使用人证件备注：" v-bind="labelCol1Note">
@@ -1007,14 +994,12 @@
       <div>
         <div v-if="rectification">
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
-            <span
-              :style="{'color':specialResult.businessLicenseState == 0 ? 'red' : 'blue'}">{{
-                specialResult.businessLicenseState == null ? '未稽核' : specialResult.businessLicenseState == '0' ? '未通过' : '通过'
-              }}</span>
+            <a-tag class="font-size-14" v-if="specialResult.businessLicenseState == 0" color="#f50">未通过</a-tag>
+            <a-tag class="font-size-14" v-if="specialResult.businessLicenseState == 1" color="#2db7f5">通过</a-tag>
           </a-form-model-item>
 
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核结果" prop="basicCheckNote" v-bind="labelCol1Note">
-            <span>{{ specialResult.businessLicenseNote }}</span>
+            <a-tag class="font-size-14" color="orange">{{ specialResult.businessLicenseNote }}</a-tag>
           </a-form-model-item>
         </div>
         <a-form-model-item style="width: 90%;" label="使用人证件备注：" v-bind="labelCol1Note">
@@ -1138,14 +1123,12 @@
       <div>
         <div v-if="rectification">
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
-            <span
-              :style="{'color':specialResult.letterIntroductionState == 0 ? 'red' : 'blue'}">{{
-                specialResult.letterIntroductionState == null ? '未稽核' :  specialResult.letterIntroductionState == '0' ? '未通过' : '通过'
-              }}</span>
+            <a-tag class="font-size-14" v-if="specialResult.letterIntroductionState == 0" color="#f50">未通过</a-tag>
+            <a-tag class="font-size-14" v-if="specialResult.letterIntroductionState == 1" color="#2db7f5">通过</a-tag>
           </a-form-model-item>
 
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核结果" prop="basicCheckNote" v-bind="labelCol1Note">
-            <span>{{ specialResult.letterIntroductionNote }}</span>
+            <a-tag class="font-size-14" color="orange">{{ specialResult.letterIntroductionNote }}</a-tag>
           </a-form-model-item>
         </div>
         <a-form-model-item style="width: 90%;" label="介绍信备注：" v-bind="labelCol1Note">
@@ -1268,14 +1251,12 @@
       <div>
         <div v-if="rectification">
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
-            <span
-              :style="{'color':specialResult.numberCardState == 0 ? 'red' : 'blue'}">{{
-                specialResult.numberCardState == null ? '未稽核' : specialResult.numberCardState == '0' ? '未通过' : '通过'
-              }}</span>
+            <a-tag class="font-size-14" v-if="specialResult.numberCardState == 0" color="#f50">未通过</a-tag>
+            <a-tag class="font-size-14" v-if="specialResult.numberCardState == 1" color="#2db7f5">通过</a-tag>
           </a-form-model-item>
 
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核结果" prop="basicCheckNote" v-bind="labelCol1Note">
-            <span>{{ specialResult.numberCardNote }}</span>
+            <a-tag class="font-size-14" color="orange">{{ specialResult.numberCardNote }}</a-tag>
           </a-form-model-item>
         </div>
         <a-form-model-item style="width: 90%;" label="号码备注：" v-bind="labelCol1Note">
@@ -1396,14 +1377,12 @@
       <div>
         <div v-if="rectification">
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
-            <span
-              :style="{'color':specialResult.handNumberCardState == 0 ? 'red' : 'blue'}">{{
-                specialResult.handNumberCardState == null ? '未稽核' : specialResult.handNumberCardState == '0' ? '未通过' : '通过'
-              }}</span>
+            <a-tag class="font-size-14" v-if="specialResult.handNumberCardState == 0" color="#f50">未通过</a-tag>
+            <a-tag class="font-size-14" v-if="specialResult.handNumberCardState == 1" color="#2db7f5">通过</a-tag>
           </a-form-model-item>
 
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核结果" prop="basicCheckNote" v-bind="labelCol1Note">
-            <span>{{ specialResult.handNumberCardNote }}</span>
+            <a-tag class="font-size-14" color="orange">{{ specialResult.handNumberCardNote }}</a-tag>
           </a-form-model-item>
         </div>
         <a-form-model-item style="width: 90%;" label="手持号卡备注：" v-bind="labelCol1Note">
@@ -1524,14 +1503,12 @@
       <div>
         <div v-if="rectification">
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
-            <span
-              :style="{'color':specialResult.consumptionVoucherState == 0 ? 'red' : 'blue'}">{{
-                specialResult.consumptionVoucherState == null ? '未稽核' :  specialResult.consumptionVoucherState == '0' ? '未通过' : '通过'
-              }}</span>
+            <a-tag class="font-size-14" v-if="specialResult.consumptionVoucherState == 0" color="#f50">未通过</a-tag>
+            <a-tag class="font-size-14" v-if="specialResult.consumptionVoucherState == 1" color="#2db7f5">通过</a-tag>
           </a-form-model-item>
 
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核结果" prop="basicCheckNote" v-bind="labelCol1Note">
-            <span>{{ specialResult.consumptionVoucherNote }}</span>
+            <a-tag class="font-size-14" color="orange">{{ specialResult.consumptionVoucherNote }}</a-tag>
           </a-form-model-item>
         </div>
         <a-form-model-item style="width: 90%;" label="消费凭证备注：" v-bind="labelCol1Note">
@@ -1654,14 +1631,12 @@
       <div>
         <div v-if="rectification">
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
-            <span
-              :style="{'color':specialResult.commitmentVideoState == 0 ? 'red' : 'blue'}">{{
-                specialResult.commitmentVideoState == null ? '未稽核' : specialResult.commitmentVideoState == '0' ? '未通过' : '通过'
-              }}</span>
+            <a-tag class="font-size-14" v-if="specialResult.commitmentVideoState == 0" color="#f50">未通过</a-tag>
+            <a-tag class="font-size-14" v-if="specialResult.commitmentVideoState == 1" color="#2db7f5">通过</a-tag>
           </a-form-model-item>
 
           <a-form-model-item style="left: 0%;width: 90%;" label="稽核结果" prop="basicCheckNote" v-bind="labelCol1Note">
-            <span>{{ specialResult.commitmentVideoNote }}</span>
+            <a-tag class="font-size-14" color="orange">{{ specialResult.commitmentVideoNote }}</a-tag>
           </a-form-model-item>
         </div>
         <a-form-model-item style="width: 90%;" label="承诺视频备注：" v-bind="labelCol1Note">
@@ -1773,6 +1748,134 @@
 
     </a-card>
 
+    <!--    其它资料-->
+    <a-card v-if="steps.currentId == 'notes'"
+            style="margin-bottom:10px;
+              float: left;width: 83%;left: 2%">
+      <div slot="title">
+        <span style="float: left;position: relative;top: 4px"> 其它资料（非必传）</span>
+      </div>
+      <!--      附件-->
+      <div>
+        <div v-if="rectification">
+          <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
+            <a-tag class="font-size-14" v-if="specialResult.notesState == 0" color="#f50">未通过</a-tag>
+            <a-tag class="font-size-14" v-if="specialResult.notesState == 1" color="#2db7f5">通过</a-tag>
+          </a-form-model-item>
+
+          <a-form-model-item style="left: 0%;width: 90%;" label="稽核结果" prop="basicCheckNote" v-bind="labelCol1Note">
+            <a-tag class="font-size-14" color="orange">{{ specialResult.notesNote }}</a-tag>
+          </a-form-model-item>
+        </div>
+        <a-form-model-item style="width: 90%;" label="其他资料备注：" v-bind="labelCol1Note">
+          <span v-if="specialResult.notesNote == 1">{{ infoModel.notesRemark }}</span>
+          <a-textarea v-else style="height: 77px"
+                      @change="textareaChange('notes','notesRemark')"
+                      v-model="infoModel.notesRemark"
+                      placeholder="其它资料"
+          />
+          <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
+        </a-form-model-item>
+      </div>
+      <!--      文件上传-->
+      <div class="file-div-minio-upload">
+        <div class="thumb-example" >
+          <!-- swiper1 -->
+          <swiper
+            class="swiper gallery-top"
+            :options="swiperOptionTop"
+            ref="swiperTop"
+          >
+            <swiper-slide class="slide-1" v-for="(item, index) in infoModel.notes" :key="item.id">
+              <iframe
+                v-if="item.urlBase"
+                frameborder="1"
+                :src="item.urlBase"
+                ref="ifr"
+                width="100%"
+                height="500px"
+                scrolling="auto">
+              </iframe>
+              <img style="width: 100%;height: 500px;border: 1px solid;"
+                   v-if="!item.urlBase" :src="noDataPng" border="1">
+              <a-button
+                v-if="infoModel.notes.length && item.urlBase && specialResult.notesState != 1"
+                style="display: block;margin-top: 10px;border-color: red;color: red;float: left"
+                danger @click="removeFile(item,'notes')">移除
+              </a-button>
+
+              <a-button
+                style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+                v-if="infoModel.notes.length && item.urlBase"
+                @click="jumpUrl(item.urlBase)">预览
+              </a-button>
+            </swiper-slide>
+            <div
+              class="swiper-button-next swiper-button-white"
+              slot="button-next"
+            ></div>
+            <div
+              class="swiper-button-prev swiper-button-white"
+              slot="button-prev"
+            ></div>
+          </swiper>
+          <!-- swiper2 Thumbs -->
+          <swiper
+            class="swiper gallery-thumbs"
+            :options="swiperOptionThumbs"
+            ref="swiperThumbs"
+          >
+            <swiper-slide
+              class="slide"
+              style="width:100px;height:100px;"
+              v-for="(item, index) in infoModel.notes"
+              :key="item.id"
+            >
+              <div v-if="item.urlBase" style="width: 100%;height: 96px;background: rgb(68,142,247);color: white">
+                <span style="white-space:normal; word-break:break-all;overflow:hidden;">{{ item.fileName }}</span>
+              </div>
+
+              <img style="width: 100%;height: 96px"
+                   v-if="!item.urlBase" :src="noDataPng" border="1">
+
+            </swiper-slide>
+            <!--              点我上传文件按钮-->
+            <div class="clearfix">
+              <a-upload
+                listType="picture-card"
+                name="file"
+                :multiple="false"
+                :action="importMinioUploadAction"
+                :customRequest="e => selfUploadContract(e, 'notes')"
+                :headers="tokenHeader"
+                :showUploadList="false"
+                :beforeUpload="importBeforeUpload"
+                @change="importHandleChange"
+              >
+                <div v-if="infoModel.notes.length < 20 && specialResult.notesState != 1">
+                  <a-icon type="plus"/>
+                  <div class="ant-upload-text">点我上传其它资料</div>
+                </div>
+              </a-upload>
+
+            </div>
+
+            <div class="swiper-button-next swiper-button-white" slot="button-next">
+              <div>
+                <!--                  <img src="../../../../assets/images/nextImg.png" alt=""/>-->
+              </div>
+            </div>
+            <div class="swiper-button-prev swiper-button-white" slot="button-prev">
+              <div>
+                <!--                  <img src="../../../../assets/images/prevImg.png" alt=""/>-->
+              </div>
+            </div>
+          </swiper>
+        </div>
+      </div>
+
+    </a-card>
+
   </a-spin>
 
 
@@ -1784,7 +1887,6 @@ import {getAction, httpAction, postAction} from "@api/manage";
 import noDataPng from '@/assets/nodata.png'
 import Vue from "vue";
 import {ACCESS_TOKEN, TENANT_ID} from "@/store/mutation-types";
-
 let Base64 = require('js-base64').Base64
 export default {
   name: 'TaskUploadData',
@@ -1894,6 +1996,9 @@ export default {
         //承诺视频
         commitmentVideoState: null,
         commitmentVideoNote: "",
+        // 其它资料
+        notesState: null,
+        notesNote: ""
       },
       // 全局是否是在加载中
       uploading: false,
@@ -1961,6 +2066,10 @@ export default {
         // 承诺视频
         commitmentVideo: [{}],
         commitmentVideoRemark: "",
+        // 其它资料
+        notes: [{}],
+        notesRemark: "",
+
       },
       //表单验证
       rules: {
@@ -2032,9 +2141,7 @@ export default {
             content: 'First-content',
             id: "fraudPrevention",
             status: "wait"
-          },
-
-
+          }
         ],
         // 有特审
         stepsMaterial: [
@@ -2120,6 +2227,15 @@ export default {
   },
   props: {},
   watch: {},
+  updated() {
+    // 实现swiper双向控制
+    this.$nextTick(() => {
+      const swiperTop = this.$refs.swiperTop.swiper
+      const swiperThumbs = this.$refs.swiperThumbs.swiper
+      swiperTop.controller.control = swiperThumbs
+      swiperThumbs.controller.control = swiperTop
+    })
+  },
   created() {
     // 是否批量上传
     this.batchImproves = this.$route.query.batchImproves;
@@ -2146,23 +2262,6 @@ export default {
     }
 
 
-  },
-  mounted() {
-    // 实现swiper双向控制
-    this.$nextTick(() => {
-      const swiperTop = this.$refs.swiperTop.swiper
-      const swiperThumbs = this.$refs.swiperThumbs.swiper
-      swiperTop.controller.control = swiperThumbs
-      swiperThumbs.controller.control = swiperTop
-    })
-    // /**监听视频拨放*/
-    // this.$refs.myVideo.addEventListener("play", () => {
-    //   this.openTimer();
-    // });
-    // /**监听视频暂停*/
-    // this.$refs.myVideo.addEventListener("pause", () => {
-    //   this.closeTimer();
-    // });
   },
   methods: {
     /**整改->获取稽核结果*/
@@ -2221,6 +2320,14 @@ export default {
       this.userLableClick()
       /**材料标签点击事件*/
       this.shutdownLabelClick()
+      this.steps.stepsNow.push(
+        {
+          title: ' 其它资料（非必传）',
+          content: 'First-content',
+          id: "notes",
+          status: "wait"
+        })
+
     },
     //材料不全有特审步骤条
     stepsMaterialLabel() {
@@ -2324,6 +2431,7 @@ export default {
               //数据发生变化
               that.infoModel[fileAttribute][0] = swipData;
             }
+            console.log(that.infoModel[fileAttribute])
             if (!that.rectification) {
               // 改变步骤条状态
               if (that.infoModel[fileAttribute].length > 0) {
@@ -2445,6 +2553,11 @@ export default {
         specialReviewForm: this.urlBaseJoin(infoModel.specialReviewForm, "url"),
         // 特审单备注
         specialReviewFormRemark: infoModel.specialReviewFormRemark,
+        // 其它资料
+        notes: this.urlBaseJoin(infoModel.notes, "url"),
+        // 其它资料备注
+        notesRemark: infoModel.notesRemark,
+
       }
       return data;
 
@@ -2664,10 +2777,17 @@ export default {
           // 承诺视频
           infoModel.commitmentVideo = that.packageArr(result.commitmentVideo)
           infoModel.commitmentVideoRemark = result.commitmentVideoRemark
+          // 其它资料
+          infoModel.notes = that.packageArr(result.notes)
+          infoModel.notesRemark = result.notesRemark
           // 用户标签
-          infoModel.userLable = result.userLable.toString()
+          if (result.userLable){
+            infoModel.userLable = result.userLable.toString()
+          }
           // 关停标签
-          infoModel.shutdownLabel = result.shutdownLabel.split(",")
+          if ( result.shutdownLabel){
+            infoModel.shutdownLabel = result.shutdownLabel.split(",")
+          }
           // 关停标签其他-名称
           infoModel.shutdownLabelOther = result.shutdownLabelOther
           // 最后一次关停时间
@@ -2755,47 +2875,6 @@ export default {
 
 </style>
 <style lang="less">
-#common-video {
-  position: relative;
-
-  .video-box {
-    box-sizing: border-box;
-    border: 0;
-    display: block;
-    width: 470px;
-    height: 500px;
-    outline: none !important;
-  }
-
-  .isShow {
-    //进度条
-    video::-webkit-media-controls-timeline {
-      display: none;
-    }
-  }
-
-  video::-webkit-media-controls-play-button {
-    visibility: hidden;
-  }
-
-  .operate-btn {
-    display: block;
-    width: 60px;
-    height: 60px;
-    position: absolute;
-    top: calc(50% - 30px);
-    left: calc(50% - 30px);
-  }
-
-  .operate-btn:hover {
-    opacity: 0.8;
-  }
-
-  .fade-out {
-    opacity: 0;
-  }
-}
-
 .thumb-example {
   width: 80%;
   margin-top: 20px;
@@ -2883,5 +2962,8 @@ export default {
   position: relative;
   left: 10%
 }
+.font-size-14 {
+  font-size:14px
+}
 
 </style>

src/views/specialApply/modules/TaskCheckAudit.vue

@@ -145,7 +145,7 @@
         </a-form-model-item>
 
         <a-form-model-item style="left: 0%;width: 90%;" label="实名制截图备注：" v-bind="labelCol1Note">
-          <span>{{ infoModel.nameFindComplianceRemark }}</span>
+          <a-tag class="font-size-14" color="orange">{{ infoModel.nameFindComplianceRemark }}</a-tag>
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
 
@@ -272,7 +272,7 @@
         </a-form-model-item>
 
         <a-form-model-item style="width: 90%;" label="身份证正反面备注：" v-bind="labelCol1Note">
-          <span>{{ infoModel.fileListIdCardRemark }}</span>
+          <a-tag class="font-size-14" color="orange">{{ infoModel.fileListIdCardRemark }}</a-tag>
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
       </div>
@@ -398,7 +398,7 @@
         </a-form-model-item>
 
         <a-form-model-item style="width: 90%;" label="手持身份证半身照片备注：" v-bind="labelCol1Note">
-          <span>{{ infoModel.handCertificateRemark }}</span>
+          <a-tag class="font-size-14" color="orange">{{ infoModel.handCertificateRemark }}</a-tag>
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
       </div>
@@ -523,7 +523,7 @@
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
         <a-form-model-item style="width: 90%;" label="防诈骗承诺涵备注：" v-bind="labelCol1Note">
-          <span>{{ infoModel.fraudPreventionRemark }}</span>
+          <a-tag class="font-size-14" color="orange">{{ infoModel.fraudPreventionRemark }}</a-tag>
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
       </div>
@@ -650,7 +650,7 @@
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
         <a-form-model-item style="width: 90%;" label="特审单备注：" v-bind="labelCol1Note">
-          <span>{{ infoModel.specialReviewFormRemark }}</span>
+          <a-tag class="font-size-14" color="orange">{{ infoModel.specialReviewFormRemark }}</a-tag>
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
       </div>
@@ -775,7 +775,7 @@
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
         <a-form-model-item style="width: 90%;" label="使用人证件备注：" v-bind="labelCol1Note">
-          <span>{{ infoModel.userCertificateRemark }}</span>
+          <a-tag class="font-size-14" color="orange">{{ infoModel.userCertificateRemark }}</a-tag>
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
       </div>
@@ -902,7 +902,7 @@
         </a-form-model-item>
 
         <a-form-model-item style="width: 90%;" label="使用人证件备注：" v-bind="labelCol1Note">
-          <span>{{ infoModel.businessLicenseRemark }}</span>
+          <a-tag class="font-size-14" color="orange">{{ infoModel.businessLicenseRemark }}</a-tag>
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
       </div>
@@ -1029,8 +1029,7 @@
         </a-form-model-item>
 
         <a-form-model-item style="width: 90%;" label="介绍信备注：" v-bind="labelCol1Note">
-          <span>{{ infoModel.letterIntroductionRemark }}</span>
-
+          <a-tag class="font-size-14" color="orange">{{ infoModel.letterIntroductionRemark }}</a-tag>
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
       </div>
@@ -1157,7 +1156,7 @@
         </a-form-model-item>
 
         <a-form-model-item style="width: 90%;" label="号卡照片备注：" v-bind="labelCol1Note">
-          <span>{{ infoModel.numberCardRemark }}</span>
+          <a-tag class="font-size-14" color="orange">{{ infoModel.numberCardRemark }}</a-tag>
 
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
@@ -1286,8 +1285,7 @@
         </a-form-model-item>
 
         <a-form-model-item style="width: 90%;" label="手持号卡照片备注：" v-bind="labelCol1Note">
-          <span>{{ infoModel.handNumberCardRemark }}</span>
-
+          <a-tag class="font-size-14" color="orange">{{ infoModel.handNumberCardRemark }}</a-tag>
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
 
@@ -1414,7 +1412,7 @@
         </a-form-model-item>
 
         <a-form-model-item style="width: 90%;" label="消费凭证备注：" v-bind="labelCol1Note">
-          <span>{{ infoModel.consumptionVoucherRemark }}</span>
+          <a-tag class="font-size-14" color="orange">{{ infoModel.consumptionVoucherRemark }}</a-tag>
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
       </div>
@@ -1539,7 +1537,7 @@
         </a-form-model-item>
 
         <a-form-model-item style="width: 90%;" label="承诺视频备注：" v-bind="labelCol1Note">
-          <span>{{ infoModel.commitmentVideoRemark }}</span>
+          <a-tag class="font-size-14" color="orange">{{ infoModel.commitmentVideoRemark }}</a-tag>
           <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
         </a-form-model-item>
       </div>
@@ -1638,6 +1636,131 @@
       </div>
 
     </a-card>
+    <!--    其它材料-->
+    <a-card v-if="steps.currentId == 'notes'"
+            style="margin-bottom:10px;
+              float: left;width: 83%;left: 2%">
+      <div slot="title">
+        <span style="float: left;position: relative;top: 4px"> 其它资料</span>
+      </div>
+      <!--      附件-->
+      <div>
+        <a-form-model-item style="left: 0%;width: 90%;" label="稽核状态" prop="basicCheckState" v-bind="labelCol1Note">
+          <a-radio-group v-model="specialResult.notesState"
+                         @change="basicCheckClick(specialResult.notesState)">
+            <a-radio :value=0>未通过</a-radio>
+            <a-radio :value=1>通过</a-radio>
+          </a-radio-group>
+        </a-form-model-item>
+
+        <a-form-model-item style="left: 0%;width: 90%;" label="稽核结果" prop="basicCheckNote" v-bind="labelCol1Note">
+          <a-textarea
+            v-model="specialResult.notesNote"
+            placeholder="请输入稽核结果"
+          />
+          <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
+        </a-form-model-item>
+
+        <a-form-model-item style="width: 90%;" label="其它备注：" v-bind="labelCol1Note">
+          <a-tag class="font-size-14" color="orange">{{ infoModel.notesRemark }}</a-tag>
+          <!--            :auto-size="{ minRows: 3, maxRows: 5 }"-->
+        </a-form-model-item>
+      </div>
+      <!--      文件上传-->
+      <div class="file-div-minio-upload">
+        <div class="thumb-example" style="position: relative">
+          <!-- swiper1 -->
+          <swiper
+            class="swiper gallery-top"
+            :options="swiperOptionTop"
+            ref="swiperTop"
+          >
+            <swiper-slide class="slide-1" v-for="(item, index) in infoModel.notes" :key="item.id">
+              <iframe
+                v-if="item.urlBase"
+                frameborder="1"
+                :src="item.urlBase"
+                ref="ifr"
+                width="100%"
+                height="500px"
+                scrolling="auto">
+              </iframe>
+              <img style="width: 100%;height: 500px;border: 1px solid;"
+                   v-if="!item.urlBase" :src="noDataPng" border="1">
+              <a-button
+                style="display: block;position: relative;float:left;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+                v-if="infoModel.notes.length && item.urlBase"
+                @click="jumpUrl(item.url)">下载
+              </a-button>
+              <a-button
+                style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+                v-if="infoModel.notes.length && item.urlBase"
+                @click="jumpUrl(item.urlBase)">预览
+              </a-button>
+
+            </swiper-slide>
+            <!--            <div
+                          class="swiper-button-next swiper-button-white"
+                          slot="button-next"
+                        ></div>
+                        <div
+                          class="swiper-button-prev swiper-button-white"
+                          slot="button-prev"
+                        ></div>-->
+          </swiper>
+          <!-- swiper2 Thumbs -->
+          <swiper
+            class="swiper gallery-thumbs"
+            :options="swiperOptionThumbs"
+            ref="swiperThumbs"
+          >
+            <swiper-slide
+              class="slide"
+              style="width:100px;height:100px;"
+              v-for="(item, index) in infoModel.notes"
+              :key="item.id"
+            >
+              <div v-if="item.urlBase" style="width: 100%;height: 96px;background: rgb(68,142,247);color: white">
+                <span style="white-space:normal; word-break:break-all;overflow:hidden;">{{ item.fileName }}</span>
+              </div>
+
+              <img style="width: 100%;height: 96px"
+                   v-if="!item.urlBase" :src="noDataPng" border="1">
+
+            </swiper-slide>
+            <!--              点我上传文件按钮-->
+            <div class="clearfix">
+              <a-upload
+                listType="picture-card"
+                name="file"
+                :multiple="false"
+                :action="importMinioUploadAction"
+                :customRequest="e => selfUploadContract(e, 'notes')"
+                :headers="tokenHeader"
+                :showUploadList="false"
+                :beforeUpload="importBeforeUpload"
+                @change="importHandleChange"
+              >
+
+              </a-upload>
+
+            </div>
+
+            <div class="swiper-button-next swiper-button-white" slot="button-next">
+              <div>
+                <!--                  <img src="../../../../assets/images/nextImg.png" alt=""/>-->
+              </div>
+            </div>
+            <div class="swiper-button-prev swiper-button-white" slot="button-prev">
+              <div>
+                <!--                  <img src="../../../../assets/images/prevImg.png" alt=""/>-->
+              </div>
+            </div>
+          </swiper>
+        </div>
+      </div>
+
+    </a-card>
 
   </a-spin>
 
@@ -1757,6 +1880,9 @@ export default {
         //承诺视频
         commitmentVideoState: null,
         commitmentVideoNote: "",
+        // 其它资料
+        notesState: null,
+        notesNote: ""
       },
       // 全局是否是在加载中
       uploading: false,
@@ -1825,6 +1951,10 @@ export default {
         // 承诺视频
         commitmentVideo: [{}],
         commitmentVideoRemark: "",
+        // 其它资料
+        notes: [{}],
+        notesRemark: "",
+
       },
       //表单验证
       rules: {
@@ -2001,12 +2131,9 @@ export default {
       this.query.infoId = this.$route.query.id;
       // 获取客户基础信息
       this.getInfoDataById(this.query.infoId)
-
     }
-
-
   },
-  mounted() {
+  updated() {
     // 实现swiper双向控制
     this.$nextTick(() => {
       const swiperTop = this.$refs.swiperTop.swiper
@@ -2037,6 +2164,8 @@ export default {
               return
             }
             that.specialResult = res.result;
+            // 步骤条
+            that.stepLoading();
             // 整改->处理步骤条状态
             for (var i in that.steps.stepsNow) {
               let id = that.steps.stepsNow[i].id;
@@ -2074,6 +2203,17 @@ export default {
       this.userLableClick()
       /**材料标签点击事件*/
       this.shutdownLabelClick()
+      /**其它材料*/
+      console.log(this.specialResult.notesState)
+      if ((this.infoModel.notes && this.infoModel.notes != "" &&  this.infoModel.notes[0].url) || this.specialResult.notesState != null ) {
+        this.steps.stepsNow.push(
+          {
+            title: ' 其它资料（非必传）',
+            content: 'First-content',
+            id: "notes",
+            status: "wait"
+          })
+      }
     },
     //材料不全有特审步骤条
     stepsMaterialLabel() {
@@ -2345,6 +2485,12 @@ export default {
         that.$message.warn("请完成相关稽核");
         return;
       }
+      if (that.infoModel.notes && that.infoModel.notes[0].url ){
+        if (specialResult.notesState == null){
+          that.$message.warn("请完成相关稽核");
+          return;
+        }
+      }
 
       //有无特审单
       if (materialLabel == '0') {
@@ -2393,6 +2539,7 @@ export default {
         that.specialResult.consumptionVoucherState = null
       }
       let SpecialParams = {}
+      console.log(that.specialResult)
       SpecialParams = that.specialResult
       SpecialParams['dataId'] = that.query.dataId
       SpecialParams['infoId'] = that.query.infoId
@@ -2447,8 +2594,6 @@ export default {
             that.infoModel.materialLabel = result.materialLabel == "无" ? "1" : "0"
             // 客户经理手机号
             that.infoModel.accountManagerPhone = result.accountManagerPhone;
-            // 特审步骤条
-            that.stepLoading();
             // 获取客户文件信息
             that.getInfoSpecialData(this.query.infoId);
 
@@ -2514,12 +2659,12 @@ export default {
           infoModel.shutdownTime = result.shutdownTime
           // 申请复开原因
           infoModel.reasonReopening = result.reasonReopening
+          // 其它材料
+          infoModel.notes = that.packageArr(result.notes);
+          infoModel.notesRemark = result.notesRemark;
           that.infoModel = infoModel
-          // 步骤条
-          that.stepLoading();
           that.findCheckState(result.id)
 
-
         }
       })
     },
@@ -2733,4 +2878,8 @@ export default {
 .cornflowerblue {
   color: cornflowerblue;
 }
+.font-size-14 {
+  font-size:14px
+}
+
 </style>

src/views/truckCheck/modules/TaskList.vue

@@ -274,7 +274,7 @@ export default {
         return;
       }
       let taskInfo = this.buildTaskInfo(this.selectionRows[0]);
-        this.$router.push({path: '/smscheck/modules/TaskImportTruck', query: {id: taskInfo.id}});
+        this.$router.push({path: '/smscheck/modules/TaskImportTruck', query: {id: taskInfo.id,type:4}});
     },
     // 显示导入页面
     showCheckList(record) {