瀏覽代碼

辅助指标

gks 1 年之前
父節點
當前提交
f9650afe13

+ 0 - 17
src/views/GATHER/index.vue

@@ -654,23 +654,6 @@
 
       <div class="remark" v-if="form.taskVoList != 0">
         <div class="remark_title" style="margin-bottom: 20px">审批记录:</div>
-        <!-- <div style="padding: 4px; border-radius: 4px; background-color: #F5F7FA;">
-          <div class="remark_item" v-for="(item, index) in form.taskVoList">
-            <span>{{ item.execName }} </span>
-            <span>{{
-              item.status == 0
-                ? "待审核"
-                : item.status == 1
-                ? "同意"
-                : item.status == 2
-                ? "驳回"
-                : "退回"
-            }} </span>
-            <span> {{ item.comments }}  </span>
-            <span>{{ item.createTime }} </span>
-          </div>
-        </div> -->
-
         <el-timeline>
           <el-timeline-item
             v-for="(item, index) in form.taskVoList"

+ 15 - 48
src/views/JOINTCONFERENCE/add.vue

@@ -43,7 +43,7 @@
       </el-form-item>
       <el-form-item label="协作要求" prop="collaborativeContent">
         <el-input
-        :disabled="!(user.deptId == 100 && user.type ==1)"
+          :disabled="!(user.deptId == 100 && user.type == 1)"
           type="textarea"
           rows="4"
           placeholder="请输入协作要求"
@@ -54,21 +54,21 @@
         <template>
           <el-radio
             @input="radioChange"
-            :disabled="!(user.deptId == 100 && user.type ==1)"
+            :disabled="!(user.deptId == 100 && user.type == 1)"
             v-model="form.type"
             label="1"
             >完结</el-radio
           >
           <el-radio
             @input="radioChange"
-            :disabled="!(user.deptId == 100 && user.type ==1)"
+            :disabled="!(user.deptId == 100 && user.type == 1)"
             v-model="form.type"
             label="2"
             >长期</el-radio
           >
           <el-radio
             @input="radioChange"
-            :disabled="!(user.deptId == 100 && user.type ==1)"
+            :disabled="!(user.deptId == 100 && user.type == 1)"
             v-model="form.type"
             label="3"
             >限期</el-radio
@@ -83,7 +83,7 @@
       >
         <el-date-picker
           :picker-options="pickerOptions"
-          :disabled="!(user.deptId == 100 && user.type ==1)"
+          :disabled="!(user.deptId == 100 && user.type == 1)"
           v-model="form.date"
           type="date"
           value-format="yyyy-MM-dd"
@@ -132,7 +132,7 @@ export default {
       },
       isShowDate: false,
       user: {
-        type:1
+        type: 1,
       },
       // 状态选择
       status: null,
@@ -179,50 +179,16 @@ export default {
 
     getInfo().then((res) => {
       this.user = res.user.dept;
-      console.log(this.user);
       if (res.user.dept.type == 1 && res.user.userId == 14) {
         listDept().then((res) => {
-          this.deptList = res.data;
+          res.data.forEach(item=>{
+            if(item.type!=3){
+              this.deptList.push(item);
+            }
+          });
+          
         });
-        // getDept().then((res) => {
-        //   console.log(res);
-        //   this.deptList = [
-        //     ...res.data,
-        //     {
-        //       searchValue: null,
-        //       createBy: "admin",
-        //       createTime: "2023-07-20 14:40:52",
-        //       updateBy: "admin",
-        //       updateTime: "2023-09-18 18:46:44",
-        //       params: {},
-        //       deptId: 100,
-        //       parentId: 0,
-        //       ancestors: "0",
-        //       deptName: "广西壮族自治区北部湾办公室",
-        //       type: 1,
-        //       orderNum: 0,
-        //       leader: "XXX",
-        //       phone: "15888888888",
-        //       biaoCang: "23",
-        //       email: "ry@qq.com",
-        //       status: "0",
-        //       delFlag: "0",
-        //       parentName: null,
-        //       industryOrientation: null,
-        //       planningArea: null,
-        //       acceptanceArea: null,
-        //       useArea: null,
-        //       usageRate: null,
-        //       warehouse: null,
-        //       oilDepot: null,
-        //       refrigeratory: null,
-        //       workshop: null,
-        //       approvalTime: null,
-        //       children: [],
-        //       createBy_dictText: "管理员",
-        //     },
-        //   ];
-        // });
+       
       } else if (res.user.dept.type == 2) {
         this.deptList = [
           {
@@ -288,7 +254,8 @@ export default {
           } else {
             cooperativeUnitId = [this.form.cooperativeUnitId];
           }
-          if(this.user.type ==1 && this.user.deptId == 100) cooperativeUnitId.push(100);
+          if (this.user.type == 1 && this.user.deptId == 100)
+            cooperativeUnitId.push(100);
           console.log(cooperativeUnitId);
 
           if (this.form.id != null) {

+ 23 - 15
src/views/JOINTCONFERENCE/detail.vue

@@ -1,28 +1,30 @@
 <template>
   <div class="cmain">
-    <el-descriptions border :labelStyle="{ width: '120px' }" :column="2">
-      <el-descriptions-item label="标题">
+    <el-descriptions size="medium" border :labelStyle="{ width: '120px' }" :column="2">
+      <el-descriptions-item label="标题"  :span="2" >
         <span v-html="form.conference.conferenceTitle"></span>
       </el-descriptions-item>
-      <el-descriptions-item label="状态">
-        <span class="status">
+      
+      
+      <el-descriptions-item cetent  label="限期日期" >
+        <span v-if="form.conference.type != 1 && form.conference.date!=null" v-text="form.conference.date"></span>
+        <span v-else>---</span>
+      </el-descriptions-item>
+      <el-descriptions-item label="状态" >
+        <div class="status">
           {{
             form.conference.type == 1
               ? "完结"
               : form.conference.type == 2
               ? "长期"
               : "限期"
-          }}</span
+          }}</div
         >
       </el-descriptions-item>
-  
-      <el-descriptions-item label="协作单位">
+      
+      <el-descriptions-item label="协作单位" :span="2" >
         <span v-text="form.conference.cooperativeUnit"></span>
       </el-descriptions-item>
-
-      <el-descriptions-item v-if="form.conference.type != 1" label="限期日期">
-        <span v-text="form.conference.date"></span>
-      </el-descriptions-item>
     </el-descriptions>
 
     <!-- <div class="detail_item">
@@ -89,10 +91,14 @@
         </el-date-picker>
       </el-form-item> -->
 
-      <div class="dept_list" v-for="(item, index) in form.reply" :key="index">
-        <div class="title">{{ item.deptName }}:</div>
-        <p>{{ item.reply }}</p>
-      </div>
+      <el-form-item v-for="(item, index) in form.reply" :key="index" :label="item.deptName + ' ' + ' 回复:'" >
+        <el-input
+          :disabled="true"
+          type="textarea"
+          rows="2"
+          v-model="item.reply"
+        ></el-input>
+      </el-form-item>
 
       <div class="detail_item wire">
         <div class="title">附件:</div>
@@ -214,6 +220,8 @@ p{
 }
 
 .status {
+  width: 60px;
+  text-align: center;
   color: #409eff;
   padding: 4px 8px;
   border: 1px solid #409eff;

+ 1 - 1
src/views/JOINTCONFERENCE/index.vue

@@ -263,7 +263,7 @@ export default {
         param: { id: row.id },
         title: "会议详情",
         width: "750px",
-        height: "60%",
+        height: "70%",
       });
     },
     handleUnit(row) {

+ 216 - 113
src/views/norm/quotaBonded.vue

@@ -236,120 +236,146 @@
       width="900px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules">
-        <el-form-item label-width="100px" label="年份" prop="year">
-          <el-date-picker
-            :disabled="isAppoval"
-            v-model="form.year"
-            type="year"
-            placeholder="请选择年份"
-            size="mini"
-            class="year-picker"
-            format="yyyy 年"
-            value-format="yyyy"
-            style="width: 60%"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label-width="100px" label="保税区" prop="bondedName">
-          <el-select
-            :disabled="isAppoval"
-            v-model="form.bondedName"
-            placeholder="请选择保税区"
-            clearable
-            filterable
-            @change="selectBondedChange"
-            style="width: 60%"
-          >
-            <el-option
-              v-for="item in deptList"
-              :key="item.deptId"
-              :label="item.deptName"
-              :value="item.deptName"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-card
-          class="box-card"
-          v-for="(dict, index) in QUOTAFEEList"
-          :key="dict.id"
-          :value="dict"
-          style="margin-bottom: 24px; font-weight: bold"
-        >
-          <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"
-            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="dict.fileList"
-              :on-remove="handleRemove"
-              :on-change="handleChange"
-              :multiple="true"
-            >
-              <el-button
+      <!-- v-if="this.form.type == 0" -->
+      <el-tabs v-model="activeName" type="border-card">
+        <!-- @tab-click="handleClick" -->
+        <el-tab-pane label="基本信息" name="基本信息">
+          <el-form ref="forms" :model="form" :rules="rules">
+            <el-form-item label-width="100px" label="年份" prop="year">
+              <el-date-picker
                 :disabled="isAppoval"
-                slot="trigger"
-                size="small"
-                type="primary"
-                >选取文件</el-button
+                v-model="form.year"
+                type="year"
+                placeholder="请选择年份"
+                size="mini"
+                class="year-picker"
+                format="yyyy 年"
+                value-format="yyyy"
+                style="width: 60%"
               >
-            </el-upload>
-          </el-form-item>
-          <el-form-item
-            v-if="dict.confirmWay == '文字说明'"
-            label-width="70px"
-            prop="remark"
-            label="说明"
-          >
-            <el-input
-              type="textarea"
-              :disabled="isAppoval"
-              v-model="dict.remark"
-              rows="5"
-            ></el-input>
-          </el-form-item>
-          <el-form-item
-            v-if="dict.confirmWay == '数值'"
-            label-width="70px"
-            prop="numValue"
-            label="数值"
-          >
-            <el-input
-              type="number"
-              :disabled="isAppoval"
-              v-model="dict.numValue"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label-width="70px" prop="score" label="分数">
-            <el-input :disabled="isAppoval" v-model="dict.score"></el-input>
-          </el-form-item>
-        </el-card>
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label-width="100px" label="保税区" prop="bondedName">
+              <el-select
+                :disabled="isAppoval"
+                v-model="form.bondedName"
+                placeholder="请选择保税区"
+                clearable
+                filterable
+                @change="selectBondedChange"
+                style="width: 60%"
+              >
+                <el-option
+                  v-for="item in deptList"
+                  :key="item.deptId"
+                  :label="item.deptName"
+                  :value="item.deptName"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+        <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
+              class="box-card"
+              v-for="(dict, index) in QUOTAFEEList"
+              :key="dict.id"
+              :value="dict"
+              style="margin-bottom: 24px; font-weight: bold"
+            >
+              <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-col>
+                  <el-col :span="12">
+                    <el-form-item label-width="90px" prop="score" label="分数:">
+                      <el-input
+                        :disabled="isAppoval"
+                        v-model="dict.score"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </div>
+              <!--          目前详情还没有返回,先在新增显示-->
+              <div
+                slot="header"
+                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>
+              </div>
+              <el-form-item
+                v-if="dict.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="dict.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="dict.confirmWay == '文字说明'"
+                label-width="70px"
+                prop="remark"
+                label="说明"
+              >
+                <el-input
+                  type="textarea"
+                  :disabled="isAppoval"
+                  v-model="dict.remark"
+                  rows="5"
+                ></el-input>
+              </el-form-item>
+              <el-form-item
+                v-if="dict.confirmWay == '数值'"
+                label-width="70px"
+                prop="numValue"
+                label="数值"
+              >
+                <el-input
+                  type="number"
+                  :disabled="isAppoval"
+                  v-model="dict.numValue"
+                ></el-input>
+              </el-form-item>
+            </el-card>
 
-        <!-- <el-form-item  label-width="100px" label="驳回理由">
+            <!-- <el-form-item  label-width="100px" label="驳回理由">
           <el-input type="textarea" width="100%" v-model="form.test"></el-input>
         </el-form-item> -->
-      </el-form>
+          </el-form>
+        </el-tab-pane>
+      </el-tabs>
 
       <template v-if="form.taskVoList">
         <div
@@ -440,6 +466,10 @@ export default {
   name: "QUOTABONDED",
   data() {
     return {
+      // 标签数据
+      tabList: [],
+      activeName: "",
+
       user: null,
       // 查看修改
       check: false,
@@ -519,17 +549,71 @@ export default {
   methods: {
     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) => {
         response.data.forEach((item, index) => {
           response.data[index].status = item.status == 0 ? false : true;
         });
         this.QUOTAFEEList = response.data;
+
         this.QUOTAFEEList.forEach((item) => {
           item.fileList = [];
           item.linkUrls = "";
           item.fileNames = "";
         });
+        this.tabList = JSON.parse(JSON.stringify(response.data));
+
+        for (var i = 0; i < this.tabList.length - 1; i++) {
+          //设置激活的tab
+          for (var j = i + 1; j < this.tabList.length; j++) {
+            if (this.tabList[i].normId == this.tabList[j].normId) {
+              this.tabList.splice(j, 1);
+              //因为数组长度减小1,所以直接 j++ 会漏掉一个元素,所以要 j--
+              j--;
+            }
+          }
+        }
+        this.activeName = "基本信息";
       });
     },
     // 获取保税区列表
@@ -603,7 +687,7 @@ export default {
         numValue: null,
       };
       this.fileList = [];
-      this.resetForm("form");
+      this.resetForm("forms");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -630,10 +714,10 @@ export default {
           (selection[0].approvalStatus == 0 ||
             selection[0].approvalStatus == null ||
             selection[0].approvalStatus == 3)
-        ){
+        ) {
           this.single = false;
-        }else{
-           this.single = true;
+        } else {
+          this.single = true;
         }
       }
     },
@@ -674,6 +758,25 @@ export default {
         this.QUOTAFEEList.forEach((item) => {
           item.fileList.push({ name: item.fileNames, url: item.linkUrls });
         });
+
+        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
+          for (var j = i + 1; j < this.tabList.length; j++) {
+            if (this.tabList[i].remark == this.tabList[j].remark) {
+              this.tabList.splice(j, 1);
+              //因为数组长度减小1,所以直接 j++ 会漏掉一个元素,所以要 j--
+              j--;
+            }
+          }
+        }
+        console.log(this.tabList);
+
+        this.activeName = "基本信息";
+
         this.open = true;
         this.$forceUpdate();
         this.title = "辅助指标录入详情";