物联网修改

README.md

@@ -1,17 +1,3 @@
-Ant Design Jeecg Vue
-====
-
-当前最新版本： 3.1.0（发布日期：20220301）
-
-Overview
-----
-
-基于 [Ant Design of Vue](https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/) 实现的 Ant Design Pro  Vue 版
-Jeecg-boot 的前端UI框架，采用前后端分离方案，提供强大代码生成器的低代码平台。
-前端页面代码和后端功能代码一键生成，不需要写任何代码，保持jeecg一贯的强大！！
-
-
-
 #### 前端技术
  
 - 基础框架：[ant-design-vue](https://github.com/vueComponent/ant-design-vue) - Ant Design Of Vue 实现
@@ -30,10 +16,6 @@ Jeecg-boot 的前端UI框架，采用前后端分离方案，提供强大代码
 项目下载和运行
 ----
 
-- 拉取项目代码
-```bash
-git clone https://github.com/zhangdaiscott/jeecg-boot.git
-cd  jeecg-boot/ant-design-vue-jeecg
 ```
 
 - 安装依赖
@@ -93,11 +75,6 @@ yarn run lint
 
 - [Vue](https://cn.vuejs.org/v2/guide)
 
-- [路由/菜单说明](https://github.com/zhangdaiscott/jeecg-boot/tree/master/ant-design-vue-jeecg/src/router/README.md)
-
-- [ANTD 默认配置项](https://github.com/zhangdaiscott/jeecg-boot/tree/master/ant-design-vue-jeecg/src/defaultSettings.js)
-
-- 其他待补充...
 
 
 备注
@@ -106,30 +83,4 @@ yarn run lint
 > @vue/cli 升级后，eslint 规则更新了。由于影响到全部 .vue 文件，需要逐个验证。既暂时关闭部分原本不验证的规则，后期维护时，在逐步修正这些 rules
 
 
-Docker 镜像使用
-----
-
- ``` 
-# 1.修改前端项目的后台域名
-    .env.development
-    域名改成： http://jeecg-boot-system:8080/jeecg-boot
-   
-# 2.先进入打包前端项目
-  yarn run build
-
-# 3.构建镜像
-  docker build -t nginx:jeecgboot .
-
-# 4.启动镜像
-  docker run --name jeecg-boot-nginx -p 80:80 -d nginx:jeecgboot
-
-# 5.配置host
-
-    # jeecgboot
-    127.0.0.1   jeecg-boot-redis
-    127.0.0.1   jeecg-boot-mysql
-    127.0.0.1   jeecg-boot-system
-  
-# 6.访问前台项目
-  http://localhost:80
 ``` 

src/views/lotCheck/TaskUploadData.vue

@@ -13,13 +13,13 @@
         <span>1.请选择所上传资料的卡类型</span>
       </div>
       <a-radio-group style="position: relative;left: 30px"
-                     @change="controlChange" v-model:value="lotData.blockType">
+                     @change="controlChange" v-model:value="lotData.blockType" :disabled="rectificationIs">
         <a-radio :value="'model'">正式卡</a-radio>
         <a-radio :value="'test'">测试卡</a-radio>
       </a-radio-group>
       <div v-if="lotData.blockType != 'test'">
         <span style="display: block">2.是否突破价格管控</span>
-        <a-radio-group style="position: relative;left: 30px;"
+        <a-radio-group style="position: relative;left: 30px;" :disabled="rectificationIs"
                        @change="controlChange" v-model:value="lotData.control">
           <a-radio :value="'controlY'">是</a-radio>
           <a-radio :value="'controlN'">否</a-radio>
@@ -31,7 +31,7 @@
     <a-card style="margin-bottom:10px">
       <!--      v-model:current="current"-->
       <a-steps :current="current" size="small">
-        <a-step v-for="item in steps" :key="item.title" :title="item.title"/>
+        <a-step v-for="item in steps" :key="item.title" :title="item.title" :status="item.status"/>
       </a-steps>
     </a-card>
     <!--    测试卡申请单-->
@@ -55,6 +55,9 @@
           <ul>
             <li>1）测试卡申请单是否加盖公章</li>
             <li>2）测试卡申请单中经办人、责任人身份证是否一致</li>
+            <li style="color: red" v-if="lotNote.testCardApplicationNote != null && lotNote.testCardApplicationNote.length > 0">
+              稽核结果备注：{{ lotNote.testCardApplicationNote}}
+            </li>
           </ul>
         </div>
       </div>
@@ -80,7 +83,7 @@
                 </iframe>
                 <img style="width: 70%;height: 70%;border: 1px solid;"
                      v-if="!item.urlBase" :src="noDataPng" border="1">
-                <a-button v-if="item.urlBase" style="display: block;margin-top: 10px;border-color: red;color: red"
+                <a-button v-if="item.urlBase && lotState.testCardApplicationState != 1" style="display: block;margin-top: 10px;border-color: red;color: red"
                           danger @click="removeFile(item)">移除
                 </a-button>
 
@@ -115,7 +118,7 @@
 
               </swiper-slide>
               <!--              点我上传文件按钮-->
-              <div class="clearfix">
+              <div v-if="lotState.testCardApplicationState != 1" class="clearfix">
                 <a-upload
                   listType="picture-card"
                   name="file"
@@ -178,6 +181,9 @@
             <li>7）是否明确防范垃圾短信和骚扰电话条款</li>
             <li>8）是否无低级错误，如缺少签字，日期等</li>
             <li>9）合同签署是否是法人，是否有授权书</li>
+            <li style="color: red" v-if="lotNote.contractNote != null && lotNote.contractNote.length > 0">
+              稽核结果备注：{{ lotNote.contractNote}}
+            </li>
           </ul>
         </div>
       </div>
@@ -203,7 +209,7 @@
                 </iframe>
                 <img style="width: 70%;height: 70%;border: 1px solid;"
                      v-if="!item.urlBase" :src="noDataPng" border="1">
-                <a-button v-if="item.urlBase" style="display: block;margin-top: 10px;border-color: red;color: red"
+                <a-button v-if="item.urlBase && lotState.contractState != 1" style="display: block;margin-top: 10px;border-color: red;color: red"
                           danger @click="removeFile(item)">移除
                 </a-button>
 
@@ -238,7 +244,7 @@
 
               </swiper-slide>
               <!--              点我上传文件按钮-->
-              <div class="clearfix">
+              <div v-if="lotState.contractState != 1" class="clearfix">
                 <a-upload
                   listType="picture-card"
                   name="file"
@@ -294,6 +300,9 @@
           <ul>
             <li>1）经办人和责任人授权书齐全并且加盖公章</li>
             <li>2）经办人和责任人与授权书一致</li>
+            <li style="color: red" v-if="lotNote.empowerNote != null && lotNote.empowerNote.length > 0">
+              稽核结果备注：{{ lotNote.empowerNote}}
+            </li>
           </ul>
         </div>
 
@@ -321,7 +330,7 @@
                 </iframe>
                 <img style="width: 70%;height: 70%;border: 1px solid;"
                      v-if="!item.urlBase" :src="noDataPng" border="1">
-                <a-button v-if="item.urlBase" style="display: block;margin-top: 10px;border-color: red;color: red"
+                <a-button v-if="item.urlBase && lotState.empowerState != 1" style="display: block;margin-top: 10px;border-color: red;color: red"
                           danger @click="removeFile(item)">移除
                 </a-button>
               </swiper-slide>
@@ -355,7 +364,7 @@
 
               </swiper-slide>
               <!--              点我上传文件按钮-->
-              <div class="clearfix">
+              <div v-if="lotState.empowerState != 1" class="clearfix">
                 <a-upload
                   listType="picture-card"
                   name="file"
@@ -412,6 +421,9 @@
         <div class="markdown" style="position: relative;top:30px">
           <ul>
             <li>1）经办人和责任人身份证复印件加盖公章</li>
+            <li style="color: red" v-if="lotNote.idCardNote != null && lotNote.idCardNote.length > 0">
+              稽核结果备注：{{ lotNote.idCardNote}}
+            </li>
           </ul>
         </div>
 
@@ -439,7 +451,7 @@
                 </iframe>
                 <img style="width: 70%;height: 70%;border: 1px solid;"
                      v-if="!item.urlBase" :src="noDataPng" border="1">
-                <a-button v-if="item.urlBase" style="display: block;margin-top: 10px;border-color: red;color: red"
+                <a-button v-if="item.urlBase && lotState.idCardState != 1" style="display: block;margin-top: 10px;border-color: red;color: red"
                           danger @click="removeFile(item)">移除
                 </a-button>
               </swiper-slide>
@@ -474,7 +486,7 @@
 
               </swiper-slide>
               <!--              点我上传文件按钮-->
-              <div class="clearfix">
+              <div v-if="lotState.idCardState != 1" class="clearfix">
                 <a-upload
                   listType="picture-card"
                   name="file"
@@ -531,6 +543,9 @@
         <div class="markdown" style="position: relative;top:30px">
           <ul>
             <li>1）客户证件复印件加盖公章</li>
+            <li style="color: red" v-if="lotNote.customerIdNote != null && lotNote.customerIdNote.length > 0">
+              稽核结果备注：{{ lotNote.customerIdNote}}
+            </li>
           </ul>
         </div>
 
@@ -558,7 +573,7 @@
                 </iframe>
                 <img style="width: 70%;height: 70%;border: 1px solid;"
                      v-if="!item.urlBase" :src="noDataPng" border="1">
-                <a-button v-if="item.urlBase" style="display: block;margin-top: 10px;border-color: red;color: red"
+                <a-button v-if="item.urlBase && lotState.customerIdState != 1" style="display: block;margin-top: 10px;border-color: red;color: red"
                           danger @click="removeFile(item)">移除
                 </a-button>
               </swiper-slide>
@@ -592,7 +607,7 @@
 
               </swiper-slide>
               <!--              点我上传文件按钮-->
-              <div class="clearfix">
+              <div v-if="lotState.customerIdState != 1" class="clearfix">
                 <a-upload
                   listType="picture-card"
                   name="file"
@@ -658,6 +673,9 @@
             <li>7）风险评估表中卡类型需写清三要素：网络制式、商业级或消费级、贴片机或插卡机</li>
             <li>8）现场考察部分截图是否清晰</li>
             <li>9）合同、入网评估表、系统受理是否一致</li>
+            <li style="color: red" v-if="lotNote.riskNote != null && lotNote.riskNote.length > 0">
+              稽核结果备注：{{ lotNote.riskNote}}
+            </li>
           </ul>
         </div>
       </div>
@@ -682,7 +700,7 @@
                 </iframe>
                 <img style="width: 70%;height: 70%;border: 1px solid;"
                      v-if="!item.urlBase" :src="noDataPng" border="1">
-                <a-button v-if="item.urlBase" style="display: block;margin-top: 10px;border-color: red;color: red"
+                <a-button v-if="item.urlBase && lotState.riskState != 1" style="display: block;margin-top: 10px;border-color: red;color: red"
                           danger @click="removeFile(item)">移除
                 </a-button>
               </swiper-slide>
@@ -716,7 +734,7 @@
 
               </swiper-slide>
               <!--              点我上传文件按钮-->
-              <div class="clearfix">
+              <div v-if="lotState.riskState != 1" class="clearfix">
                 <a-upload
                   listType="picture-card"
                   name="file"
@@ -778,6 +796,9 @@
             <li>3）同客户同项目测试卡数量不得超100张，最高不得超500张。</li>
             <li>4）物联网开卡时提供公免卡审批表，开卡张数和公免额度与审批表一致。物联网公免卡的审批人员和流程同大网公免卡一致。</li>
             <li>5）累计限免有效期原则上不得大于15个月</li>
+            <li style="color: red" v-if="lotNote.priceApprovalNote != null && lotNote.priceApprovalNote.length > 0">
+              稽核结果备注：{{ lotNote.priceApprovalNote}}
+            </li>
           </ul>
         </div>
       </div>
@@ -802,7 +823,7 @@
                 </iframe>
                 <img style="width: 70%;height: 70%;border: 1px solid;"
                      v-if="!item.urlBase" :src="noDataPng" border="1">
-                <a-button v-if="item.urlBase" style="display: block;margin-top: 10px;border-color: red;color: red"
+                <a-button v-if="item.urlBase && lotState.priceApprovalState != 1" style="display: block;margin-top: 10px;border-color: red;color: red"
                           danger @click="removeFile(item)">移除
                 </a-button>
 
@@ -838,7 +859,7 @@
 
               </swiper-slide>
               <!--              点我上传文件按钮-->
-              <div class="clearfix">
+              <div v-if="lotState.priceApprovalState != 1" class="clearfix">
                 <a-upload
                   listType="picture-card"
                   name="file"
@@ -894,6 +915,9 @@
         <div class="markdown" style="position: relative;top:30px">
           <ul>
             <li>1）如有其他材料请进行上传</li>
+            <li style="color: red" v-if="lotNote.commitmentNote != null && lotNote.commitmentNote.length > 0">
+              稽核结果备注：{{ lotNote.commitmentNote}}
+            </li>
           </ul>
         </div>
       </div>
@@ -918,7 +942,7 @@
                 </iframe>
                 <img style="width: 70%;height: 70%;border: 1px solid;"
                      v-if="!item.urlBase" :src="noDataPng" border="1">
-                <a-button v-if="item.urlBase" style="display: block;margin-top: 10px;border-color: red;color: red"
+                <a-button v-if="item.urlBase && lotState.commitmentState != 1" style="display: block;margin-top: 10px;border-color: red;color: red"
                           danger @click="removeFile(item)">移除
                 </a-button>
               </swiper-slide>
@@ -950,10 +974,9 @@
                 <img style="width: 100%;height: 96px"
                      v-if="!item.urlBase" :src="noDataPng" border="1">
 
-
               </swiper-slide>
               <!--              点我上传文件按钮-->
-              <div class="clearfix">
+              <div v-if="lotState.commitmentState != 1" class="clearfix">
                 <a-upload
                   listType="picture-card"
                   name="file"
@@ -989,8 +1012,6 @@
         </div>
       </div>
     </a-card>
-
-
   </div>
 
 </template>
@@ -1012,6 +1033,8 @@ export default {
   components: {noDataPng},
   data() {
     return {
+      //是否整改
+      rectificationIs: false,
       noDataPng: noDataPng,
       //加载状态
       loading: false,
@@ -1022,7 +1045,9 @@ export default {
         updateFile: "/smsCheck/customerData/updateFile",
         minioUpload: "/smsCheck/customerData/uploadMinio",
         list: "/smsCheck/customerData/list",
-        addOrEdit: "/smsLot/customerData/edit/info"
+        addOrEdit: "/smsLot/customerData/edit/info",
+        lotInfo: "/smsLot/customerData/query/infoId",
+        checkDataId: "/smsLot/customerData/query/check/dataId",
       },
       //步骤条数据
       current: 0,
@@ -1031,31 +1056,38 @@ export default {
         {
           title: '合同',
           content: 'First-content',
+          status: "wait"
         },
         {
           title: '责任人和经办人授权书',
           content: 'First-content',
+          status: "wait"
         },
         {
           title: '责任人和经办人身份证',
           content: 'First-content',
+          status: "wait"
         },
         {
           title: '客户证件扫描',
           content: 'First-content',
+          status: "wait"
         },
         {
           title: '风险评估表',
           content: 'First-content',
+          status: "wait"
         },
         {
           title: '省/集团价格审批表',
           content: 'First-content',
+          status: "wait"
         },
         {
           title: '承诺涵（其他材料-非必填）',
           content: 'First-content',
           id: "commitment",
+          status: "wait"
         }
 
       ],
@@ -1063,27 +1095,33 @@ export default {
         {
           title: '合同',
           content: 'First-content',
+          status: "wait"
         },
         {
           title: '责任人和经办人授权书',
           content: 'First-content',
+          status: "wait"
         },
         {
           title: '责任人和经办人身份证',
           content: 'First-content',
+          status: "wait"
         },
         {
           title: '客户证件扫描',
           content: 'First-content',
+          status: "wait"
         },
         {
           title: '风险评估表',
           content: 'First-content',
+          status: "wait"
         },
         {
           title: '承诺涵（其他材料-非必填）',
           content: 'First-content',
           id: "commitment",
+          status: "wait"
         }
 
       ],
@@ -1092,23 +1130,28 @@ export default {
         {
           title: '测试卡申请单',
           content: 'First-content',
+          status: "wait"
         },
         {
           title: '责任人和经办人授权书',
           content: 'First-content',
+          status: "wait"
         },
         {
           title: '责任人和经办人身份证',
           content: 'First-content',
+          status: "wait"
         },
         {
           title: '客户证件扫描',
           content: 'First-content',
+          status: "wait"
         },
         {
           title: '承诺涵（其他材料-非必填）',
           id: "commitment",
           content: 'First-content',
+          status: "wait"
         }
       ],
       next: "",
@@ -1141,6 +1184,44 @@ export default {
         //其他材料
         commitmentFiles: [],
       },
+      //整改稽核备注
+      lotNote: {
+        //合同
+        contractNote: null,
+        //测试卡申请单
+        testCardApplicationNote: null,
+        //责任人经办人授权书
+        empowerNote: null,
+        //责任人经办人身份证
+        idCardNote: null,
+        //客户证件
+        customerIdNote: null,
+        //风险评估表稽核结果
+        riskNote: null,
+        //省/集团价格审批表
+        priceApprovalNote: null,
+        //其他材料
+        commitmentNote: null,
+      },
+      //整改稽核结果
+      lotState: {
+        //合同
+        contractState: null,
+        //测试卡申请单
+        testCardApplicationState: null,
+        //责任人经办人授权书
+        empowerState: null,
+        //责任人经办人身份证
+        idCardState: null,
+        //客户证件
+        customerIdState: null,
+        //风险评估表稽核结果
+        riskState: null,
+        //省/集团价格审批表
+        priceApprovalState: null,
+        //其他材料
+        commitmentState: null,
+      },
       //缩略与大图数据源
       swiperId: 0 + 1,
       swiperImg: [{}],
@@ -1178,6 +1259,8 @@ export default {
   },
   created() {
     this.infoId = this.$route.query.id;
+    //是否需要整改
+    this.lotInfoById(this.infoId)
   },
   computed: {
     importMinioUploadAction() {
@@ -1227,6 +1310,177 @@ export default {
     }
   },
   methods: {
+    /**获取物联网稽核结果*/
+    lotCheckById(id) {
+      let that = this;
+      let url = this.url.checkDataId;
+      let params = {
+        infoId: id
+      }
+      postAction(url, params).then(res => {
+        if (res.success) {
+          let data = res.result;
+          if (data != null) {
+            for (var i in that.steps) {
+              that.stepsStatus(i, data);
+            }
+          }
+        }
+      }).finally(() => {
+
+      })
+    },
+    stepsStatus(current, data) {
+      let that = this;
+      //卡类型
+      let blockType = that.lotData.blockType;
+      switch (current) {
+        case '0':
+          if (blockType == 0) {
+            //测试卡
+            that.steps[current].status = data.testCardApplicationState == '0' ? "error" : "finish";
+            //备注
+            that.lotNote.testCardApplicationNote = data.testCardApplicationNote;
+            //稽核结果
+            that.lotState.testCardApplicationState = data.testCardApplicationState;
+          } else {
+            //正式卡
+            that.steps[current].status = data.contractState == '0' ? "error" : "finish";
+            that.lotNote.contractNote = data.contractNote
+            that.lotState.contractState = data.contractState;
+          }
+          break;
+        case '1':
+          that.steps[current].status = data.empowerState == '0' ? "error" : "finish";
+          that.lotNote.empowerNote = data.empowerNote
+          that.lotState.empowerState = data.empowerState;
+          break;
+        case '2':
+          that.steps[current].status = data.idCardState == '0' ? "error" : "finish";
+          that.lotNote.idCardNote = data.idCardNote
+          that.lotState.idCardState = data.idCardState
+          break;
+        case '3':
+          that.steps[current].status = data.customerIdState == '0' ? "error" : "finish";
+          that.lotNote.customerIdNote = data.customerIdNote
+          that.lotState.customerIdState = data.customerIdState
+          break;
+        case '4':
+          that.steps[current].status = data.riskState == '0' ? "error" : "finish";
+          that.lotNote.riskNote = data.riskNote
+          that.lotState.riskState = data.riskState
+          break;
+        case '5' && that.steps[current].id != "commitment":
+          that.steps[current].status = data.priceApprovalState == '0' ? "error" : "finish";
+          that.lotNote.priceApprovalNote = data.priceApprovalNote
+          that.lotState.priceApprovalState = data.priceApprovalState
+        default:
+          if (that.steps[current].id == "commitment") {
+            that.steps[current].status = data.commitmentState == '0' ? "error" : "finish";
+            that.lotNote.commitmentNote =  data.commitmentNote;
+            that.lotState.commitmentState = data.commitmentState;
+          }
+          break;
+      }
+    },
+    /**获取物联网文件数据*/
+    lotInfoById(id) {
+      let that = this;
+      let url = this.url.lotInfo;
+      let params = {
+        infoId: id
+      }
+      postAction(url, params).then(res => {
+        if (res.success) {
+          let data = res.result;
+          if (data == null || !data) {
+            return;
+          }
+          that.lotDataValue(data);
+        }
+      }).finally(() => {
+
+      })
+    },
+    lotDataValue(data) {
+      let that = this;
+      //为整改
+      that.rectificationIs = true;
+      //是否突破价格管控 0:未突破；1:突破
+      that.lotData.control = data.control == 0 ? "controlN" : "controlY";
+      //卡类型 0测试卡；1正式卡,
+      that.lotData.blockType = data.blockType == 0 ? "test" : "model";
+      //判断步骤类型
+      let control = data.control;
+      let blockType = data.blockType;
+      if (control == 0 && blockType == 1) {
+        this.steps = this.stepsControlN;
+      } else if (control == 1 && blockType == 1) {
+        this.steps = this.stepsControlY;
+      } else if (blockType == 0) {
+        this.steps = this.stepsTest;
+      } else {
+        this.steps = this.stepsControlN;
+      }
+      //材料覆值
+      //ID
+      that.lotData.id = data.id
+      //合同
+      that.lotData.contractFiles = that.packageArr(data.contract);
+      //责任人经办人授权书
+      that.lotData.empowerFiles = that.packageArr(data.empower)
+      //责任人经办人身份证
+      that.lotData.idCardFiles = that.packageArr(data.idCard)
+      //客户证件
+      that.lotData.scanningFiles = that.packageArr(data.customerId)
+      //风险评估表
+      that.lotData.riskFiles = that.packageArr(data.risk)
+      //省集团价格审批表
+      that.lotData.priceFiles = that.packageArr(data.priceApproval)
+      //测试卡申请单
+      that.lotData.testCardApplication = that.packageArr(data.testCardApplication)
+      //承诺函/其它材料
+      that.lotData.commitmentFiles = that.packageArr(data.commitment);
+
+      if (that.lotData.blockType == "model") {
+        that.swiperImg = that.lotData.contractFiles
+      } else if (that.lotData.blockType == 'test') {
+        that.swiperImg = that.lotData.testCardApplication
+      }
+      //稽核结果
+      that.lotCheckById(that.infoId);
+    },
+    /**包装轮播数据*/
+    packageArr(data) {
+      let id = 0;
+      let newArr = []
+      if (data == null) {
+        newArr.push({})
+        return newArr;
+      }
+      let splice = data.split(",");
+      for (var i in splice) {
+        id = id + 1;
+        let filePath = splice[i];
+        if (filePath == "") {
+          break;
+        }
+        let fileName = filePath.split("/");
+        fileName = fileName[fileName.length - 1];
+        let swipData = {
+          id: id,
+          urlBase: window._CONFIG['onlinePreviewDomainURL'] + '?url='
+            + encodeURIComponent(
+              Base64.encode(
+                (filePath)
+              )),
+          url: filePath,
+          fileName: fileName
+        }
+        newArr.push(swipData);
+      }
+      return newArr;
+    },
     /**卡类型及价格管控监听事件*/
     controlChange(a, event) {
       let blockType = this.lotData.blockType;
@@ -1294,13 +1548,11 @@ export default {
 
 
     },
-
     /**分割数组*/
     spliceArr(data, fileData) {
       let indexOf = data.indexOf(fileData);
       return data.splice(indexOf, 1)
     },
-
     /**自定义的上传文件方法*/
     selfUploadContract(data) {
       let that = this;
@@ -1374,7 +1626,6 @@ export default {
     },
     /**文件上传成功后回调*/
     importHandleChange(info) {
-
     },
     /**文件格式限制*/
     importBeforeUpload(file) {
@@ -1417,9 +1668,7 @@ export default {
         } else {
           this.lotData.isShow.commitmentShow = false;
         }
-
         this.currentFileType(this.current);
-
       }
     },
     /**上一步骤*/
@@ -1539,6 +1788,8 @@ export default {
       data["blockType"] = this.lotData.blockType == "model" ? 1 : 0;
       //是否突破价格管控
       data["control"] = this.lotData.control == "controlY" ? 1 : 0;
+      //其他材料
+      data['commitment'] = this.urlBaseJoin(this.lotData.commitmentFiles, "url");
       postAction(this.url.addOrEdit, data).then((res) => {
         if (res.success) {
           this.$message.success("提交成功");

src/views/lotCheck/modules/TaskCheckAudit.vue

@@ -654,7 +654,7 @@
 
       </a-card>
       <!--    省/集团价格审批表-->
-      <a-card v-if="current == 5"
+      <a-card v-if="current == 5 && !lotData.isShow.commitmentShow"
               style="margin-bottom:10px;
               float: left;width: 83%;left: 2%">
         <div slot="title">
@@ -821,10 +821,11 @@
                 <swiper-slide
                   class="slide"
                   style="width:100px;height:100px;"
-                  v-for="(item, index) in lotData.priceApproval"
+                  v-for="(item, index) in lotData.commitment"
                   :key="item.id"
                 >
-                  <div v-if="item.urlBase" style="width: 100%;height: 96px;background: rgb(68,142,247);color: white">
+                  <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>
 
@@ -958,7 +959,7 @@ export default {
         //承诺函/其他材料
         commitmentModel: {
           //备注
-          basicCheckNote: "",
+          basicCheckNote: null,
           //稽核结果
           basicCheckState: null,
         },
@@ -1166,11 +1167,15 @@ export default {
       //省集团价格审批表
       basicCheckState = that.lotData.priceApprovalModel.basicCheckState;
       let priceApprovalState = basicCheckState == 0 || basicCheckState == 1 ? basicCheckState : null;
+      //承诺函，其他材料
+      basicCheckState = that.lotData.commitmentModel.basicCheckState;
+      let commitmentState = basicCheckState == 0 || basicCheckState == 1 ? basicCheckState : null;
+
       if (control == 0 && blockType == 1) {
         //正式卡 未突破价格管控
         if (contractState == null || empowerState == null ||
           idCardState == null || customerIdState == null
-          || riskState == null) {
+          || riskState == null || commitmentState == null) {
           this.$message.error("请完成相关稽核！")
           return;
         }
@@ -1178,18 +1183,21 @@ export default {
         //正式卡 突破价格管控
         if (contractState == null || empowerState == null ||
           idCardState == null || customerIdState == null
-          || riskState === null || priceApprovalState == null) {
+          || riskState === null || priceApprovalState == null || commitmentState == null) {
           this.$message.error("请完成相关稽核！")
           return;
         }
       } else if (blockType == 0) {
         //测试卡
         if (testCardApplicationState == null || empowerState == null ||
-          idCardState == null || customerIdState == null || riskState == null) {
+          idCardState == null || customerIdState == null ||
+          riskState == null || commitmentState == null) {
           this.$message.error("请完成相关稽核！")
           return;
         }
+
       }
+
       let auditData = {
         "dataId": that.info.dataId,
         "blockType": that.lotData.blockType,
@@ -1208,7 +1216,9 @@ export default {
         "riskState": riskState,
         "riskNote": that.lotData.riskModel.basicCheckNote,
         "priceApprovalState": priceApprovalState,
-        "priceApprovalNote": that.lotData.priceApprovalModel.basicCheckNote
+        "priceApprovalNote": that.lotData.priceApprovalModel.basicCheckNote,
+        "commitmentState": commitmentState,
+        "commitmentNote": that.lotData.commitmentModel.basicCheckNote
 
       }
 
@@ -1278,12 +1288,16 @@ export default {
           this.lotData.priceApprovalModel.basicCheckNote = basicCheckNote5
           break;
       }
-
-
     },
     /**步骤条点击事件*/
     stepsClick(current) {
       this.current = current;
+      //其他材料
+      if (this.steps[this.current].id == "commitment") {
+        this.lotData.isShow.commitmentShow = true;
+      } else {
+        this.lotData.isShow.commitmentShow = false;
+      }
       this.currentFileType(current);
     },
     /**步骤文件类型对应*/
@@ -1292,32 +1306,37 @@ export default {
       this.swiperImg = {}
       //卡类型
       let blockType = that.lotData.blockType;
-      switch (current) {
-        case 0:
-          if (blockType == 0) {
-            that.swiperImg = that.lotData.testCardApplication
-          } else {
-            that.swiperImg = that.lotData.contract
-          }
-          break;
-        case 1:
-          that.swiperImg = that.lotData.empower
-          break;
-        case 2:
-          that.swiperImg = that.lotData.idCard
-          break;
-        case 3:
-          that.swiperImg = that.lotData.customerId
-          break;
-        case 4:
-          that.swiperImg = that.lotData.risk
-          break;
-        case 5:
-          that.swiperImg = that.lotData.priceApproval
-          break;
+      if (that.lotData.isShow.commitmentShow) {
+        console.log("commitment：" + that.lotData.commitment);
+        that.swiperImg = that.lotData.commitment;
+      } else {
+        switch (current) {
+          case 0:
+            if (blockType == 0) {
+              that.swiperImg = that.lotData.testCardApplication
+            } else {
+              that.swiperImg = that.lotData.contract
+            }
+            break;
+          case 1:
+            that.swiperImg = that.lotData.empower
+            break;
+          case 2:
+            that.swiperImg = that.lotData.idCard
+            break;
+          case 3:
+            that.swiperImg = that.lotData.customerId
+            break;
+          case 4:
+            that.swiperImg = that.lotData.risk
+            break;
+          case 5:
+            that.swiperImg = that.lotData.priceApproval
+            break;
+        }
       }
       //拒绝下标为空 影响轮播样式
-      if (that.swiperImg.length == 0) {
+      if (that.swiperImg == null || that.swiperImg.length == 0) {
         that.swiperImg.push({})
       }
     },
@@ -1375,10 +1394,8 @@ export default {
           //是否突破价格管控
           that.lotData.control = data.control;
           //承诺函/其它材料
-          that.lotData.commitment = data.commitment;
-          if (data.commitment != null && data.commitment.length > 0) {
-            that.lotData.isShow.commitmentShow = true;
-          }
+          that.lotData.commitment = that.packageArr(data.commitment);
+
           let control = that.lotData.control;
           let blockType = that.lotData.blockType;
           //步骤条数据源

src/views/lotCheck/modules/TaskCheckDetails.vue

@@ -663,11 +663,97 @@
         </div>
 
 
+      </a-card>
+      <!--    承诺函/其它资料-->
+      <a-card v-if="lotData.isShow.commitmentShow"
+              style="margin-bottom:10px;
+              float: left;width: 83%;left: 2%">
+        <div slot="title">
+          <span style="float: left;position: relative;top: 4px">承诺函/其他材料</span>
+        </div>
+        <!--        稽核结果-->
+        <div style="float: left;width: 30%">
+          <div class="markdown" style="position: relative;top:30px">
+            <ul>
+              <li>1）请上传承诺函或其它资料</li>
+            </ul>
+          </div>
+        </div>
+        <!--      轮播-->
+        <div style="width: 65%;float:left;margin-left: 5%">
+          <div style="height: 70%">
+            <div class="thumb-example">
+              <!-- swiper1 -->
+              <swiper
+                class="swiper gallery-top"
+                :options="swiperOptionTop"
+                ref="swiperTop"
+              >
+                <swiper-slide class="slide-1" v-for="(item, index) in lotData.commitment" :key="item.id">
+                  <iframe
+                    v-if="item.urlBase"
+                    frameborder="1"
+                    :src="item.urlBase"
+                    ref="ifr"
+                    width="604px"
+                    height="445px"
+                    scrolling="auto">
+                  </iframe>
+                  <img style="width: 95%;height: 70%;border: 1px solid;"
+                       v-if="!item.urlBase" :src="noDataPng" border="1">
+
+                </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 lotData.commitment"
+                  :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: 95%;height: 96px"
+                       v-if="!item.urlBase" :src="noDataPng" border="1">
+
+                </swiper-slide>
+
+
+                <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>
+        </div>
+
+
       </a-card>
 
     </div>
 
-    <!--  合同资料-->
 
   </div>
 
@@ -727,8 +813,12 @@ export default {
           prevEl: '.swiper-button-prev'
         }
       },
+
       //物联网资料
       lotData: {
+        isShow: {
+          commitmentShow: false
+        },
         //合同稽核状态
         contractModel: {
           //备注
@@ -795,7 +885,9 @@ export default {
         //省/集团价格审批表
         priceApproval: [],
         //测试卡申请单
-        testCardApplication: []
+        testCardApplication: [],
+        //其他资料
+        commitment: [],
       },
       //步骤条
       current: 0,
@@ -831,6 +923,12 @@ export default {
           title: '省/集团价格审批表',
           content: 'First-content',
           status: "wait"
+        },
+        {
+          title: '承诺涵（其他材料-非必填）',
+          content: 'First-content',
+          id: "commitment",
+          status: "wait"
         }
       ],
       stepsControlN: [
@@ -858,6 +956,12 @@ export default {
           title: '风险评估表',
           content: 'First-content',
           status: "wait"
+        },
+        {
+          title: '承诺涵（其他材料-非必填）',
+          content: 'First-content',
+          id: "commitment",
+          status: "wait"
         }
       ],
       //测试卡步骤条
@@ -886,6 +990,12 @@ export default {
           title: '风险评估表',
           content: 'First-content',
           status: "wait"
+        },
+        {
+          title: '承诺涵（其他材料-非必填）',
+          content: 'First-content',
+          id: "commitment",
+          status: "wait"
         }
       ],
       alertWarning: [
@@ -923,7 +1033,6 @@ export default {
     this.info.id = this.$route.query.id;
     this.queryInfoById(this.info.id);
     this.lotInfoById(this.info.id);
-
   },
   methods: {
 
@@ -1020,6 +1129,10 @@ export default {
         case 5:
           that.swiperImg = that.lotData.priceApproval
           break;
+        default:
+          if (that.steps[current].id == "commitment") {
+            that.swiperImg = that.lotData.commitment;
+          }
       }
       //拒绝下标为空 影响轮播样式
       if (that.swiperImg.length == 0) {
@@ -1110,9 +1223,14 @@ export default {
         case '4':
           that.steps[current].status = data.riskState == '0' ? "error" : "finish";
           break;
-        case '5':
+        case '5' && that.steps[current].id != "commitment":
           that.steps[current].status = data.priceApprovalState == '0' ? "error" : "finish";
           break;
+        default:
+          if (that.steps[current].id == "commitment") {
+            that.steps[current].status = data.commitmentState == '0' ? "error" : "finish";
+          }
+          break;
       }
     },
 
@@ -1141,6 +1259,8 @@ export default {
           that.lotData.priceApproval = that.packageArr(data.priceApproval)
           //测试卡申请单
           that.lotData.testCardApplication = that.packageArr(data.testCardApplication)
+          //其他资料
+          that.lotData.commitment = that.packageArr(data.commitment)
           //卡类型
           that.lotData.blockType = data.blockType;
           //是否突破价格管控

src/views/lotCheck/modules/TaskCheckList.vue

@@ -99,11 +99,16 @@
 
           <template slot="action" slot-scope="text, record">
 
-            <span v-has="'lot:task:check:list:upload:improve'" v-if="record.checkState == 0 || record.checkState == 1 || record.checkState == 4">
+            <span v-has="'lot:task:check:list:upload:improve'" v-if="record.checkState == 0 || record.checkState == 1">
               <a @click="showImproveAndUpload(record)">上传资料</a>
               <a-divider type="vertical"/>
             </span>
 
+            <span v-has="'lot:task:check:list:upload:rectification'" v-if="record.checkState == 4">
+              <a @click="showImproveAndUpload(record)">整改</a>
+              <a-divider type="vertical"/>
+            </span>
+
             <span v-has="'lot:task:check:list:submit'" v-if="record.checkState == 1 || record.checkState == 4">
               <a @click="handSubmit(record)">提交</a>
               <a-divider type="vertical"/>
@@ -114,6 +119,11 @@
               <a-divider type="vertical"/>
             </span>
 
+            <span v-has="'lot:task:check:list:audit:resetting'" v-if="record.checkState === 5">
+              <a @click="showCheckCheck(record)">重新稽核</a>
+              <a-divider type="vertical"/>
+            </span>
+
             <span v-has="'lot:task:check:list:history'" v-if="record.checkState >= 4">
               <a @click="showCheckLog(record)">历史</a>
               <a-divider type="vertical"/>
@@ -126,21 +136,29 @@
             </span>
 
             <a-dropdown>
-              <a class="ant-dropdown-link">更多
+              <a  class="ant-dropdown-link">更多
                 <a-icon type="down"/>
               </a>
               <a-menu slot="overlay">
 
+                <a-menu-item>
+                  <a-popconfirm>
+                    <a>详情</a>
+                  </a-popconfirm>
+                </a-menu-item>
+
                 <a-menu-item v-has="'task:check:list:delete'">
                   <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                     <a>删除</a>
                   </a-popconfirm>
                 </a-menu-item>
+
                 <a-menu-item v-has="'task:check:list:clear'">
                   <a-popconfirm title="确定清空吗?" @confirm="() => dataDelete(record.id)">
                     <a>清空</a>
                   </a-popconfirm>
                 </a-menu-item>
+
               </a-menu>
             </a-dropdown>
           </template>