zhuangyunsheng 1 år sedan
förälder
incheckning
30d89c2ded

+ 9 - 27
src/assets/style/common.scss

@@ -1,7 +1,7 @@
 //ui 库
 //查询表格列表统一样式
 .tjm_card_style_custom {
-    // border:1px solid red;
+    
     .tjm_card_title {
         font-size: 18px;
         font-weight: 500;
@@ -21,41 +21,19 @@
         align-items: flex-start;
         justify-content: space-between;
 
-        // 
         .tjm_card_select_left {
-            // border:1px solid red;    
             flex: 1;
 
-            // .el-form-item__content {
-            //     width: 280px;
-            //     // border:1px solid red;
-            // }
-            .el-form-item{
+            .el-form-item {
                 width: 308px !important;
-                // border:1px solid red;
+
                 .el-select {
                     width: 100% !important;
                 }
             }
-            .el-input {
-                // --el-input-width: 280px !important;
-            }
-
-            .el-select {
-                // width: 280px !important;
-            }
-
-            // .el-date-editor {
-            //     width: 280px !important;
-            // }
-
-            // .el-date-editor--daterange {
-            //     width: 280px !important;
-            // }
         }
 
         .tjm_card_select_right {
-            // border:1px solid red;
             height: 80px;
             width: 100px;
             display: flex;
@@ -80,22 +58,25 @@
     .tjm_card_table {
         display: flex;
         margin-top: 20px;
+
         .tjm_card_table_left {
             margin-right: 10px;
             width: 280px;
-            // border:1px solid red;
         }
 
         .tjm_card_table_right {
             flex: 1;
             width: 0;
         }
+
         .tjm_card_table_double_left{
             width: 43%;
         }
+
         .tjm_card_table_double_right{
             width: 43%;
         }
+
         .tjm_card_table_double_opea{
             flex: 1;
             display: flex;
@@ -103,8 +84,9 @@
             align-items: center;
             justify-content: center;
         }
+
         .tjm_card_table_header {
-            background: #F4F4F4;
+            background: #f4f4f4 !important;
             color: #333333;
         }
     }

+ 4 - 1
src/components/Upload/index.vue

@@ -118,7 +118,10 @@
                     const promiseArray = [Folder.rm(fileName)];
                     id && promiseArray.push(Folder.fileRemove(id));
 
-                    return Promise.all(promiseArray).then(() => true).catch(() => false);
+                    return Promise.all(promiseArray).then(() => {
+                        id && this.$emit("updateTable");
+                        return true;
+                    }).catch(() => false);
 				}).catch(() => false);
 			},
 

+ 1 - 1
src/views/policyShare/approve.vue

@@ -86,7 +86,7 @@ export default {
                         if (res.code === 200) {
                             this.visible = false;
                             ElMessage.success("操作成功");
-                            $emit("success", this.form.id)
+                            this.$emit("success", this.form.id)
                         } else ElMessage.error(res.msg);
                     });
                 } else {

+ 4 - 2
src/views/policyShare/dialog.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog v-model="visible" :title="titleMap[mode]" :width="680" @closed="$emit('closed')">
+    <el-dialog v-model="visible" :title="titleMap[mode]" :width="680" @closed="$emit('closed', fileIsDel)">
         <el-form ref="formRef" :model="form" :rules="rules" :disabled="mode == 'detail' || mode == 'approve'" label-width="100px">
             <el-row>
                 <el-col v-if="form.id" :span="12">
@@ -63,7 +63,7 @@
                 </el-col>
                 <el-col :span="24">
                     <el-form-item :class="(mode == 'detail' || mode == 'approve') && 'no-upload-btn'" label="附件">
-                        <yhUpload v-model="form.fileList" :limit="10">
+                        <yhUpload v-model="form.fileList" :limit="10" @updateTable="fileIsDel = true">
                             <el-button type="primary" icon="upload" size="small"></el-button>
                         </yhUpload>
                     </el-form-item>
@@ -171,6 +171,7 @@ export default {
                 inWhType: [{ required: true, message: "请选择入库类型" }],
             },
 
+            fileIsDel: false,
             dialog: false
         }
     },
@@ -223,6 +224,7 @@ export default {
             API[mode](this.form).then(() => {
                 ElMessage.success("操作成功");
                 this.visible = false;
+                this.fileIsDel = false;
                 this.$emit("success", mode);
             });
         },

+ 22 - 21
src/views/policyShare/index.vue

@@ -50,31 +50,31 @@
             </div>
         </div>
         <div class="tjm_card_table">
-            <el-table v-loading="loading" row-key="id" header-cell-class-name="tjm_card_table_header" height="450" :data="tableData" border>
+            <el-table v-loading="loading" row-key="id" header-cell-class-name="tjm_card_table_header" height="400" :data="tableData" border>
                 <el-table-column type="index" width="50"></el-table-column>
                 <el-table-column label="政策编号" prop="businessNo" width="180"></el-table-column>
-                <el-table-column label="状态" width="180">
-                    <template #default="scope">{{ formatStatus(scope.row) }}</template>
+                <el-table-column label="状态" width="100">
+                    <template #default="scope">{{ formatStatus(scope.row.status) }}</template>
                 </el-table-column>
                 <el-table-column label="政策名称" prop="name" width="180"></el-table-column>
-                <el-table-column label="政策等级" prop="zcLevel" width="180"></el-table-column>
-                <el-table-column label="政策类别" prop="zcType" width="180"></el-table-column>
+                <el-table-column label="政策等级" prop="zcLevel" width="100"></el-table-column>
+                <el-table-column label="政策类别" prop="zcType" width="100"></el-table-column>
                 <el-table-column label="政策文号" prop="docNo" width="180"></el-table-column>
                 <el-table-column label="填报人" prop="createName" width="180"></el-table-column>
                 <el-table-column label="填报单位" prop="companyName" width="180"></el-table-column>
                 <el-table-column label="填报时间" prop="createTime" width="180"></el-table-column>
                 <el-table-column label="联系方式" prop="contactPhone" width="180"></el-table-column>
-                <el-table-column label="考核评分" prop="score" width="180"></el-table-column>
-                <el-table-column label="是否入库" width="180">
+                <el-table-column label="考核评分" prop="score" width="100"></el-table-column>
+                <el-table-column label="是否入库" width="100">
                     <template #default="scope">{{ formatInWh(scope.row.isInWh) }}</template>
                 </el-table-column>
-                <el-table-column label="入库类别" prop="inWhType" width="180"></el-table-column>
-                <el-table-column label="操作" fixed="right" width="260">
+                <el-table-column label="入库类别" prop="inWhType" width="100"></el-table-column>
+                <el-table-column label="操作" fixed="right" width="180">
                     <template #default="scope">
                         <template v-if="scope.row.status == 'active' || scope.row.status == 'inactive'">
-                            <el-button type="primary" icon="edit" link @click="table_edit(scope.row)">修改</el-button>
-                            <el-button type="primary" icon="edit" link @click="table_update(scope.row)">提交</el-button>
-                            <el-button type="primary" icon="delete" link @click="table_del(scope.row)">删除</el-button>
+                            <el-button type="primary" link @click="table_edit(scope.row)">修改</el-button>
+                            <el-button type="primary" link @click="table_update(scope.row)">提交</el-button>
+                            <el-button type="primary" link @click="table_del(scope.row)">删除</el-button>
                         </template>
                         <el-button v-if="scope.row.status == 'approve' || scope.row.status == 'done'" type="primary" link @click="table_edit(scope.row, 'detail')">详情</el-button>
                         <el-button v-if="scope.row.status == 'approve'" type="primary" link @click="table_update(scope.row, 'withdraw')">撤回</el-button>
@@ -87,7 +87,7 @@
         </div>
     </el-card>
 
-    <policy-detail v-if="dialog" ref="policyDetail" @success="reloadTable" @closed="dialog = false"></policy-detail>
+    <policy-detail v-if="dialog" ref="policyDetail" @success="reloadTable" @closed="closed"></policy-detail>
 </template>
 
 <script>
@@ -124,9 +124,8 @@ export default {
     },
 
     methods: {
-        formatStatus({ status, isInWh }) {
-            if (status == "done" && isInWh == 1) return "审核入库"
-            return statusDic[status] || "";
+        formatStatus(value) {
+            return statusDic[value] || "";
         },
 
         formatInWh (value)  {
@@ -182,7 +181,7 @@ export default {
 
         table_update(row, mode = "saveApprove") {
             const msg = mode == "withdraw" && "撤回" || "提交";
-            ElMessageBox.confirm(`是否确认${msg}?`, `${msg}警告`, {
+            ElMessageBox.confirm(`是否确认${msg}?`, "提示", {
                 type: "warning",
                 confirmButtonText: "确定",
                 cancelButtonText: "取消"
@@ -194,10 +193,12 @@ export default {
                     } else ElMessage.error(res.msg);
                 });
             });
+        },
+
+        closed(e) {
+            e && this.reloadTable();
+            this.dialog = false;
         }
     }
 }
-</script>
-
-<style lang="scss" scoped>
-</style>
+</script>

+ 3 - 3
src/views/toDo/index.vue

@@ -21,16 +21,16 @@
         <el-divider></el-divider>
 
         <div class="tjm_card_table">
-            <el-table v-loading="loading" row-key="id" header-cell-class-name="tjm_card_table_header" height="450" :data="tableData" border>
+            <el-table v-loading="loading" row-key="id" header-cell-class-name="tjm_card_table_header" height="400" :data="tableData" border>
                 <el-table-column type="index" width="50"></el-table-column>
                 <el-table-column label="政策名称" prop="zcName" width="180"></el-table-column>
                 <el-table-column label="政策概要" prop="zcAbstractContent" width="180" show-overflow-tooltip></el-table-column>
-                <el-table-column label="政策类别" prop="zcType" width="180"></el-table-column>
+                <el-table-column label="政策类别" prop="zcType" width="100"></el-table-column>
                 <el-table-column label="填报人" prop="zcCreateName" width="180"></el-table-column>
                 <el-table-column label="填报单位" prop="zcCompanyName" width="180"></el-table-column>
                 <el-table-column label="联系方式" prop="zcContactPhone" width="180"></el-table-column>
                 <el-table-column label="填报时间" prop="zcCreateTime" width="180"></el-table-column>
-                <el-table-column label="操作" width="100">
+                <el-table-column label="操作" fixed="right" width="120">
                     <template #default="scope">
                         <el-button type="primary" link @click="table_detail(scope.row)">审核</el-button>
                     </template>