辅助指标样式修改

src/views/JOINTCONFERENCE/detail.vue

@@ -209,8 +209,7 @@ p{
   margin-top: 20px;
   margin-bottom: 20px;
 }
-.wire {
-}
+
 .detail_item .title {
   // width: 100px;
   margin: 0;

src/views/norm/quotaBonded.vue

@@ -276,7 +276,14 @@
             </el-form-item>
           </el-form>
         </el-tab-pane>
-        <el-tab-pane label="指标项" name="指标项" v-if="QUOTAFEEList.length != 0">
+
+
+
+        <el-tab-pane
+          label="指标项"
+          name="指标项"
+          v-if="QUOTAFEEList.length != 0"
+        >
           <el-form ref="form" :model="form" :rules="rules">
             <!-- v-if="dict.remark == item.normId" -->
             <el-card
@@ -289,13 +296,20 @@
               <div slot="header" style="margin-left: 30px; font-size: 15px">
                 <el-row>
                   <el-col :span="12">
-                    <el-form-item label-width="90px" prop="score" label="指标：">
-                    <span>{{ dict.quotaName }}</span>
-                  </el-form-item>
-
+                    <el-form-item
+                      label-width="90px"
+                      prop="score"
+                      label="指标："
+                    >
+                      <span>{{ dict.quotaName }}</span>
+                    </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label-width="90px" prop="score" label="分数：">
+                    <el-form-item
+                      label-width="90px"
+                      prop="score"
+                      label="分数："
+                    >
                       <el-input
                         :disabled="isAppoval"
                         v-model="dict.score"
@@ -310,10 +324,13 @@
                 style="margin-left: 30px; font-size: 15px"
                 v-show="title == '辅助指标录入新增'"
               >
-              <el-form-item label-width="90px" prop="score" label="指标内容：">
-
-                <span>{{ dict.content }}</span>
-              </el-form-item>
+                <el-form-item
+                  label-width="90px"
+                  prop="score"
+                  label="指标内容："
+                >
+                  <span>{{ dict.content }}</span>
+                </el-form-item>
               </div>
               <el-form-item
                 v-if="dict.confirmWay == '附件'"
@@ -353,7 +370,7 @@
                   type="textarea"
                   :disabled="isAppoval"
                   v-model="dict.remark"
-                  rows="5"
+                  rows="3"
                 ></el-input>
               </el-form-item>
               <el-form-item
@@ -375,62 +392,129 @@
         </el-form-item> -->
           </el-form>
         </el-tab-pane>
-      </el-tabs>
-
-      <template v-if="form.taskVoList">
-        <div
-          style="
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
-          <p
-            style="
-              padding-right: 12px;
-              margin: 0px;
-              font-weight: 600;
-              font-size: 14px;
-              color: #606266;
-              width: 100px;
-              text-align: right;
-            "
-          >
-            审核记录
-          </p>
-          <p
+        <el-tab-pane label="审核记录" name="审核记录" v-if="form.taskVoList">
+          <div
             style="
-              color: #8cc8ff;
-              border: 1px solid #3794eb;
-              padding: 4px;
-              border-radius: 4px;
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
             "
           >
-            {{
-              form.approvalStatus == 0 || form.approvalStatus == null
-                ? "未审核"
-                : form.approvalStatus == 1
-                ? "审核中"
-                : form.approvalStatus == 2
-                ? "审核通过"
-                : "审核拒绝"
-            }}
-          </p>
-        </div>
-        <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>
-              <p v-if="item.comments != null">{{ item.comments }}</p>
-            </el-card>
-          </el-timeline-item>
-        </el-timeline>
-      </template>
+            <p
+              style="
+                padding-right: 12px;
+                margin: 0px;
+                font-weight: 600;
+                font-size: 14px;
+                color: #606266;
+                width: 100px;
+                text-align: right;
+              "
+            >
+              审核记录
+            </p>
+            <p
+              style="
+                color: #8cc8ff;
+                border: 1px solid #3794eb;
+                padding: 4px;
+                border-radius: 4px;
+              "
+            >
+              {{
+                form.approvalStatus == 0 || form.approvalStatus == null
+                  ? "未审核"
+                  : form.approvalStatus == 1
+                  ? "审核中"
+                  : form.approvalStatus == 2
+                  ? "审核通过"
+                  : "审核拒绝"
+              }}
+            </p>
+          </div>
+          <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>
+                <p v-if="item.comments != null">{{ item.comments }}</p>
+              </el-card>
+            </el-timeline-item>
+          </el-timeline>
+        </el-tab-pane>
+
+        <!-- <el-tab-pane v-for="it in tabList" :label="it.normName" :name="it.normName">
+          <el-form v-model="QUOTAFEEList" v-for="(items,index) in QUOTAFEEList" v-if="it.normId == items.normId" >
+            <el-form-item label="指标：">
+              <span>{{ items.content }}</span>
+            </el-form-item>
+
+            <el-form-item  label="指标内容：">
+              <span>{{ items.content }}</span>
+            </el-form-item>
+
+            <el-form-item
+                v-if="items.confirmWay == '附件'"
+                label-width="70px"
+                prop="linkUrls"
+                label="上传附件"
+              >
+                <el-upload
+                  :disabled="isAppoval"
+                  class="upload-demo"
+                  ref="upload"
+                  :headers="upload.headers"
+                  :action="upload.url"
+                  :on-success="handleFileSuccess.bind(null, index)"
+                  :auto-upload="true"
+                  :file-list="items.fileList"
+                  :on-remove="handleRemove"
+                  :on-change="handleChange"
+                  :multiple="true"
+                >
+                  <el-button
+                    :disabled="isAppoval"
+                    slot="trigger"
+                    size="small"
+                    type="primary"
+                    >选取文件</el-button
+                  >
+                </el-upload>
+              </el-form-item>
+              <el-form-item
+                v-if="items.confirmWay == '文字说明'"
+                label-width="70px"
+                prop="remark"
+                label="说明"
+              >
+                <el-input
+                  type="textarea"
+                  :disabled="isAppoval"
+                  v-model="items.remark"
+                  rows="5"
+                ></el-input>
+              </el-form-item>
+              <el-form-item
+                v-if="items.confirmWay == '数值'"
+                label-width="70px"
+                prop="numValue"
+                label="数值"
+              >
+                <el-input
+                  type="number"
+                  :disabled="isAppoval"
+                  v-model="items.numValue"
+                ></el-input>
+              </el-form-item>
+
+          </el-form>
+        </el-tab-pane> -->
+
+      </el-tabs>
 
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" v-if="!isAppoval" @click="submitForm"
@@ -550,44 +634,6 @@ export default {
     checkPermi,
     checkRole,
 
-    validatorList(code, name, sendValue) {
-      if (typeof name != "string") return;
-      if (sendValue == 1) return;
-
-      if (
-        code == "A001" ||
-        code == "A002" ||
-        code == "A003" ||
-        code == "A004" ||
-        code == "A005" ||
-        code == "A006" ||
-        code == "A007" ||
-        code == "A008" ||
-        code == "C002" ||
-        code == "C003" ||
-        code == "D001" ||
-        code == "E001" ||
-        code == "E002" ||
-        code == "E003" ||
-        code == "E004" ||
-        code == "F001" ||
-        code == "F002"
-      ) {
-        return {
-          collCalue: [
-            { required: true, message: "不能为空", trigger: "blur" },
-            { trigger: "blur", validator: this.validatorFloatNum },
-          ],
-        };
-      } else if (code == "A009" || code == "A010") {
-        return {
-          collCalue: [
-            { required: true, message: "不能为空", trigger: "blur" },
-            { pattern: /^[1-9]\d*$/, message: "请输入正整数", trigger: "blur" },
-          ],
-        };
-      }
-    },
 
     listQUOTAFEERole() {
       listQUOTAFEERole().then((response) => {
@@ -701,7 +747,6 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      console.log(selection);
       this.ids = selection.map((item) => item.id);
       this.multiple = !selection.length;
 
@@ -760,8 +805,6 @@ export default {
         });
 
         this.tabList = JSON.parse(JSON.stringify(response.data.bondedFeeList));
-        console.log(this.tabList);
-        console.log("---");
 
         for (var i = 0; i < this.tabList.length - 1; i++) {
           //设置激活的tab
@@ -773,7 +816,6 @@ export default {
             }
           }
         }
-        console.log(this.tabList);
 
         this.activeName = "基本信息";
 
@@ -785,8 +827,6 @@ export default {
 
     // 文件上传成功处理
     handleFileSuccess(index, response, file, fileList) {
-      // console.log("1111", index);
-      // console.log("22222", fileList);
       let linkUrls = "";
       let fileNames = "";
       fileList.forEach((item) => {
@@ -799,12 +839,10 @@ export default {
           item.fileNames = fileNames;
         }
       });
-      // console.log("1111111111", this.QUOTAFEEList);
     },
     /** 提交按钮 */
     async submitForm() {
       this.form.bondedFeeList = this.QUOTAFEEList;
-      // console.log("44444444-form", this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           /*if (!(parseInt(this.form.score) == this.form.score)) {
@@ -850,7 +888,6 @@ export default {
                       });
                       //this.form.linkUrls = res.fileNames;
                       //this.form.fileNames = res.newFileNames;
-                      // console.log("555555555-form", this.form);
                       updateQUOTABONDED(this.form).then((response) => {
                         this.$modal.msgSuccess("修改成功");
                         this.open = false;
@@ -893,7 +930,6 @@ export default {
                     });
                     //this.form.linkUrls = res.fileNames;
                     //this.form.fileNames = res.newFileNames;
-                    // console.log("6666666666-form", this.form);
                     addQUOTABONDED(this.form).then((response) => {
                       this.$modal.msgSuccess("新增成功");
                       this.open = false;