Merge branch '1025branch' of http://106.55.241.82:3000/lzf/zhbsq-vue-web into 1025branch

src/views/norm/quotaBonded.vue

@@ -148,6 +148,7 @@
                 scope.row.approvalStatus == 3) &&
               checkPermi(['gather:QUOTABONDED:audit'])
             "
+            icon="el-icon-top"
             size="mini"
             type="text"
             @click="handleApprove(scope.row)"
@@ -173,7 +174,7 @@
             "
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            icon="el-icon-check"
             @click="handleReport(scope.row)"
             >上报</el-button
           >
@@ -204,7 +205,7 @@
             v-if="checkPermi(['business:QUOTABONDED:query'])"
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            icon="el-icon-search"
             @click="handleSelect(scope.row)"
             >查看</el-button
           >
@@ -213,7 +214,7 @@
     </el-table>
 
     <pagination
-      v-if="checkPermi('business:QUOTABONDED:list')"
+      v-if="checkPermi(['business:QUOTABONDED:list'])"
       v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -235,7 +236,7 @@
             :disabled="isAppoval"
             v-model="form.year"
             type="year"
-            placeholder="请选123择年份"
+            placeholder="请选择年份"
             size="mini"
             class="year-picker"
             format="yyyy 年"
@@ -273,6 +274,10 @@
           <div slot="header" style="margin-left: 30px; font-size: 15px">
             <span>指标：{{ dict.quotaName }}</span>
           </div>
+<!--          目前详情还没有返回，先在新增显示-->
+          <div slot="header" style="margin-left: 30px; font-size: 15px" v-show="title == '辅助指标录入新增' ">
+          <span>指标内容：{{ dict.content }}</span>
+          </div>
           <el-form-item
             v-if="dict.confirmWay == '附件'"
             label-width="70px"
@@ -338,21 +343,23 @@
           <el-input type="textarea" width="100%" v-model="form.test"></el-input>
         </el-form-item> -->
       </el-form>
-      
-      <p style="padding-right: 12px; margin-top: 30px; font-weight:600;font-size: 14px;
+
+      <template v-if="form.taskVoList">
+        <p style="padding-right: 12px; margin-top: 30px; font-weight:600;font-size: 14px;
     color: #606266; width: 100px; text-align: right;">审核记录</p>
-      <el-timeline>
-        <el-timeline-item
-          v-for="(item, index) in form.taskVoList"
-          :timestamp="item.createTime"
-          placement="top"
-          :key="index + 'taskHisAction'"
-        >
-          <el-card>
-            <p>{{ item.execName }}{{ item.createTime }}  <p v-if="item.comments !=null">{{ item.comments }}</p></p>
-          </el-card>
-        </el-timeline-item>
-      </el-timeline>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(item, index) in form.taskVoList"
+            :timestamp="item.createTime"
+            placement="top"
+            :key="index + 'taskHisAction'"
+          >
+            <el-card>
+              <p>{{ item.execName }}{{ item.createTime }}  <p v-if="item.comments !=null">{{ item.comments }}</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </template>
 
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" v-if="!isAppoval" @click="submitForm">确 定</el-button>
@@ -614,8 +621,8 @@ export default {
 
     // 文件上传成功处理
     handleFileSuccess(index, response, file, fileList) {
-      console.log("1111", index);
-      console.log("22222", fileList);
+      // console.log("1111", index);
+      // console.log("22222", fileList);
       let linkUrls = "";
       let fileNames = "";
       fileList.forEach((item) => {
@@ -628,12 +635,12 @@ export default {
           item.fileNames = fileNames;
         }
       });
-      console.log("1111111111", this.QUOTAFEEList);
+      // console.log("1111111111", this.QUOTAFEEList);
     },
     /** 提交按钮 */
     async submitForm() {
       this.form.bondedFeeList = this.QUOTAFEEList;
-      console.log("44444444-form", this.form);
+      // console.log("44444444-form", this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           /*if (!(parseInt(this.form.score) == this.form.score)) {
@@ -679,7 +686,7 @@ export default {
                       });
                       //this.form.linkUrls = res.fileNames;
                       //this.form.fileNames = res.newFileNames;
-                      console.log("555555555-form", this.form);
+                      // console.log("555555555-form", this.form);
                       updateQUOTABONDED(this.form).then((response) => {
                         this.$modal.msgSuccess("修改成功");
                         this.open = false;
@@ -722,7 +729,7 @@ export default {
                     });
                     //this.form.linkUrls = res.fileNames;
                     //this.form.fileNames = res.newFileNames;
-                    console.log("6666666666-form", this.form);
+                    // console.log("6666666666-form", this.form);
                     addQUOTABONDED(this.form).then((response) => {
                       this.$modal.msgSuccess("新增成功");
                       this.open = false;