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

src/components/AuxiliaryAudit/index.vue

@@ -144,9 +144,10 @@
             >
               <el-card>
                 <p>
-                  {{ item.execId }} {{ item.acname }} 于 {{ item.createTime }}
+                  {{ item.execName }} {{ item.acname }} 于 {{ item.createTime }} --- <span > {{item.status == 0 ? '待审核' : (item.status == 1 ? '同意' : (item.status == 2 ? '驳回' : '退回')) }} </span> 
                 </p>
-                <p v-if="item.comments">{{"驳回理由：" + item.comments }}</p>
+
+                <p v-if="item.comments">{{"审核意见：" + item.comments }}</p>
               </el-card>
             </el-timeline-item>
           </el-timeline>

src/views/GATHER/index.vue

@@ -556,8 +556,8 @@
         </el-form>
       </template>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm('add')">确 定</el-button>
-        <el-button @click="submitForm('draft')" type="warning">暂 存</el-button>
+        <el-button v-if="checkPermi(['gather:GATHER:add'])" type="primary" @click="submitForm('add')">确 定</el-button>
+        <el-button v-if="checkPermi(['gather:GATHER:add'])" @click="submitForm('draft')" type="warning">暂 存</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -691,7 +691,7 @@
                     : "退回"
                 }}------{{ item.acname }}------{{ item.createTime }}
                 <p v-if="item.comments != null">{{
-                  "驳回理由：" + item.comments
+                  "审核意见：" + item.comments
                 }}</p>
               </p>
             </el-card>

src/views/QUESTION/index.vue

@@ -128,7 +128,7 @@
           {{ scope.row.detail }}
         </template>
       </el-table-column> -->
-      <el-table-column label="评价状态" align="center" prop="status">
+      <el-table-column label="回复状态" align="center" prop="status">
         <template slot-scope="scope">
           <!-- <el-tag v-if="scope.row.status == 0">未回复</el-tag> -->
           <el-tag v-if="scope.row.status == 1" type="success"
@@ -148,11 +148,14 @@
       </el-table-column>
       <el-table-column label="审核状态" align="center" prop="checkStatus" width="100px">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.checkStatus == 0">待审核</el-tag>
-          <el-tag v-else-if="scope.row.checkStatus == 1" type="success"
-            >已审核</el-tag
+          <el-tag v-if="scope.row.checkStatus == 0" type="info">草稿</el-tag>
+          <el-tag v-else-if="scope.row.checkStatus == 1" 
+            >待审核</el-tag
           >
-          <el-tag v-else-if="scope.row.checkStatus == 2" type="danger"
+          <el-tag v-else-if="scope.row.checkStatus == 2" type="success"
+            >审核通过</el-tag
+          >
+          <el-tag v-else-if="scope.row.checkStatus == 3" type="danger"
             >审核拒绝</el-tag
           >
         </template>

src/views/norm/quotaBonded.vue

@@ -111,12 +111,12 @@
         <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" v-model="form.year" type="year" placeholder="请选择年份" size="mini"
+              <el-date-picker :disabled="basicInfo" 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
+              <el-select :disabled="basicInfo" 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>
@@ -141,8 +141,7 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label-width="90px" prop="score" label="分数：">
-                      <el-input :disabled="(isAppoval && (dict.isF == undefined ? true : false))" v-model="dict.score"></el-input>
-                     
+                      <el-input :disabled="(isAppoval && !dict.flag)" v-model="dict.score"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -154,17 +153,19 @@
                 </el-form-item>
               </div>
               <el-form-item v-if="dict.confirmWay == '附件'" label-width="70px" prop="linkUrls" label="上传附件">
-                <el-upload :on-exceed="exceedHandle" :limit="1" :disabled="isAppoval && (dict.isF == undefined ? true : false)" class="upload-demo" ref="upload"
+                <el-upload :on-exceed="exceedHandle" :limit="1"  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-preview="handleDownload" :on-remove="handleRemove" :on-change="handleChange" >
-                  <el-button :disabled="isAppoval && (dict.isF == undefined ? true : false)" slot="trigger" size="small" type="primary">选取文件</el-button>
+                  :auto-upload="true" :file-list="dict.fileList" :on-preview="handleDownload" :on-remove="handleRemove"
+                  :on-change="handleChange">
+                  <el-button :disabled="(isAppoval && !dict.flag)" 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 && (dict.isF == undefined ? true : false)" v-model="dict.remark" rows="3"></el-input>
+                <el-input type="textarea" :disabled="(isAppoval && !dict.flag)" v-model="dict.remark" rows="3"></el-input>
               </el-form-item>
               <el-form-item v-if="dict.confirmWay == '数值'" label-width="70px" prop="numValue" label="数值">
-                <el-input type="number" :disabled="isAppoval && (dict.isF == undefined ? true : false)" v-model="dict.numValue"></el-input>
+                <el-input type="number" :disabled="(isAppoval && !dict.flag)" v-model="dict.numValue"></el-input>
               </el-form-item>
             </el-card>
 
@@ -220,8 +221,8 @@
 
       </el-tabs>
       <div slot="footer" class="dialog-footer">
-       
-        <el-button type="primary" v-if="(!isAppoval) || (user.roleId == 10)" @click="submitForm">确 定</el-button>
+
+        <el-button type="primary" v-if="(isShowBtn) || (user.roleId == 10)" @click="submitForm">确 定</el-button>
         <!-- <el-button type="primary" v-if="user.roleId == 10" @click="submitForm">确 定</el-button> -->
 
         <el-button @click="cancel">取 消</el-button>
@@ -260,8 +261,11 @@ export default {
       // 标签数据
       tabList: [],
       activeName: "",
-
+      dict: {},
       user: {},
+
+      isShowBtn: false,
+      basicInfo: true,
       // 查看修改
       check: false,
 
@@ -281,9 +285,11 @@ export default {
         url: process.env.VUE_APP_BASE_API + "/common/upload",
       },
       uploadUrl: process.env.VUE_APP_BASE_API + "/common/uploads",
-      isAppoval: false,
+      isAppoval: true,
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
+      // 权限列表
+      authorList: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -302,7 +308,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      QUOTAFEEList: [{isF:false}],
+      QUOTAFEEList: [],
       BONDEDList: [],
       fileList: [],
       // 保税区列表
@@ -331,9 +337,7 @@ export default {
   },
   created() {
     this.listQUOTAFEERole();
-    // listAllBONDED().then((response) => {
-    //   this.BONDEDList = response.rows;
-    // });
+
     this.getList();
     this.getDeptList();
   },
@@ -344,6 +348,7 @@ export default {
 
     listQUOTAFEERole() {
       listQUOTAFEERole().then((response) => {
+        this.authorList = response.data;
         response.data.forEach((item, index) => {
           response.data[index].status = item.status == 0 ? false : true;
         });
@@ -475,8 +480,9 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.basicInfo = false;
+      this.isShowBtn = true;
       this.listQUOTAFEERole();
-      this.isAppoval = false;
       this.reset();
       this.open = true;
       this.title = "辅助指标录入新增";
@@ -487,11 +493,13 @@ export default {
       const id = row.id || this.ids;
       getQUOTABONDED(id).then((response) => {
         this.form = response.data;
-        this.isAppoval = false;
+        this.basicInfo = false;
+        this.isShowBtn = true;
         this.QUOTAFEEList = response.data.bondedFeeList;
         this.QUOTAFEEList.forEach((item) => (item.fileList = []));
-        this.QUOTAFEEList.forEach((item) => {
-          if(item.fileNames && item.linkUrls){
+        this.QUOTAFEEList.forEach((item, i) => {
+          item.flag = true;
+          if (item.fileNames && item.linkUrls) {
             item.fileList.push({ name: item.fileNames, url: item.linkUrls });
           }
         });
@@ -504,7 +512,8 @@ export default {
 
     handleSelect(row) {
 
-      
+      this.isShowBtn = false;
+      this.basicInfo = true;
       this.reset();
       const id = row.id || this.ids;
       getQUOTABONDED(id).then((response) => {
@@ -513,7 +522,7 @@ export default {
         this.QUOTAFEEList = response.data.bondedFeeList;
         this.QUOTAFEEList.forEach((item) => (item.fileList = []));
         this.QUOTAFEEList.forEach((item) => {
-          if(item.fileNames && item.linkUrls){
+          if (item.fileNames && item.linkUrls) {
             item.fileList.push({ name: item.fileNames, url: item.linkUrls });
           }
         });
@@ -546,7 +555,7 @@ export default {
       let linkUrls = [];
       let fileNames = [];
       fileList.forEach((item) => {
-        linkUrls.push(item.response.fileName );
+        linkUrls.push(item.response.fileName);
         fileNames.push(item.response.newFileName);
       });
       this.QUOTAFEEList.forEach((item, key) => {
@@ -555,18 +564,18 @@ export default {
           item.fileNames = fileNames.toString();
         }
       });
-      
+
     },
     /** 提交按钮 */
     submitForm() {
-   
+
       this.form.bondedFeeList = this.QUOTAFEEList;
-      this.form.bondedFeeList.forEach((item,i)=>{
-          item.quotaId = item.id;
+      this.form.bondedFeeList.forEach((item, i) => {
+        item.quotaId = item.id;
       })
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          if(this.user.roleId == 10 ) {
+          if (this.user.roleId == 10) {
             this.form.type = 1;
           }
           if (this.form.id != null) {
@@ -729,7 +738,6 @@ export default {
         listQUOTAFEERole().then((response) => {
           response.data.forEach((item, index) => {
             response.data[index].status = item.status == 0 ? false : true;
-            response.data[index].isF = true;
           });
           data = response.data;
         });
@@ -785,7 +793,7 @@ export default {
       );
     },
 
-    handleDownload(file){
+    handleDownload(file) {
       let path = file.url.replace("/profile", "");
       let name = file.name;
       fileDownloadFun({ fileName: path, delete: false }).then((res) => {