修改正则

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/views/ImpressionNanan.vue

@@ -46,7 +46,7 @@
             <el-table-column prop="isAlbum" label="加入专辑" sortable="isAlbum" width="110" :show-overflow-tooltip="true"
                 slot="default">
                 <template slot-scope="scope">
-                    <span>{{ scope.row.isAlbum === 0 ? '未加入' : scope.row.isAlbum === 1 ? '已加入' : '' }}</span>
+                    <span>{{ scope.row.isAlbum === 0 ? '未加入' : scope.row.isAlbum >0 ? '已加入' : '' }}</span>
                 </template>
             </el-table-column>
             <el-table-column prop="examineState" sortable="examineState" label="作品状态" width="110" slot="default">
@@ -113,7 +113,7 @@
 
         <!-- 新增作品 -->
         <el-dialog :visible.sync="addWorkDialog" width="80%" class="detailDialog" :close-on-click-modal="false"
-            top="40px">
+            top="40px" :close="closed()">
             <div slot="title">
                 <div class="addTitle">新增作品</div>
             </div>
@@ -225,7 +225,7 @@
         </el-dialog>
 
         <!--        查看-->
-        <el-dialog :visible.sync="dialogTableVisible" class="detailDialog" width="80%" top="40px">
+        <el-dialog :visible.sync="dialogTableVisible" class="detailDialog" width="80%" top="40px" :close="closed()">
             <div slot="title">
                 <div class="addTitle">查看作品详情</div>
             </div>
@@ -280,7 +280,7 @@
                         </el-col>
                     </el-row>
                     <el-form-item label="审核状态">
-                        <el-select v-model="impressionNanan.examineState" placeholder="请选择审核状态" disabled=""
+                        <el-select v-model="tableDetail.examineState" placeholder="请选择审核状态" disabled=""
                             style="width: 100%">
                             <el-option label="未审核" :value=0 disabled></el-option>
                             <el-option label="已通过" :value=1 disabled></el-option>
@@ -324,7 +324,7 @@
 
         <!--        修改作品-->
         <el-dialog :visible.sync="modifyWorkDialog" width="80%" class="detailDialog" :close-on-click-modal="false"
-            top="40px">
+            top="40px" :close="closed()">
             <div slot="title">
                 <div class="addTitle">修改作品</div>
             </div>
@@ -444,7 +444,7 @@
 
         <!--        审核-->
         <el-dialog :visible.sync="isShowExamineState" class="detailDialog2" width="80%" top="40px"
-            style="height: 100%;overflow: auto">
+            style="height: 100%;overflow: auto"  :close="closed()">
             <div slot="title">
                 <div class="addTitle">审核作品</div>
             </div>
@@ -757,6 +757,11 @@ export default {
         handleSelectChange() {
             this.$forceUpdate()
         },
+        closed(){
+            if(this.$refs.addWorkForm){
+                this.$refs.addWorkForm.clearValidate();
+            }
+        },
         //排序
         sortChange(column) {
             this.column = { ...column }
@@ -1004,12 +1009,41 @@ export default {
 
         //保存印象南岸
         saveWorkAdd() {
-            if (this.fileList.length === 0) {
-                this.$message.error('请先选择图片');
+            if(!this.impressionNanan.pictureTitle){
+                this.$message.error('请输入作品名称！');
+                return;
+            }
+            if(!this.impressionNanan.pictureAuthor){
+                this.$message.error('请输入作品作者！');
+                return;
+            }
+             if(!this.impressionNanan.vestingDate){
+                this.$message.error('请选择归属日期！');
+                return;
+            }
+            
+             if(!this.impressionNanan.uploaderPhone){
+                this.$message.error('请输入作者电话！');
                 return;
             }
-            if (!this.impressionNanan.albumPeople) {
-                this.$message.error('请选择专辑人');
+            if (!this.impressionNanan.pictureDescription) {
+                this.$message.error('请输入作品描述！');
+                return;
+            }
+            if(this.impressionNanan.isAnonymous == null){
+                this.$message.error('请选择作者是否匿名！');
+                return;
+            }
+            if(this.impressionNanan.isPublic == null){
+                this.$message.error('请选择作者电话是否公开！');
+                return;
+            }
+            if(this.impressionNanan.pictureType == null){
+                this.$message.error('请选择作品年代！');
+                return;
+            }
+            if (this.fileList.length === 0) {
+                this.$message.error('请先选择图片');
                 return;
             }
             this.$refs.addWorkForm.validate(valid => {

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/views/administration.vue

@@ -121,14 +121,14 @@
                             审核
                         </el-button> -->
                         <!--                    :disabled="scope.row.examineState==='未通过'?true:(scope.row.examineState==='未审核'?true:false)"-->
-                        <el-button class="but"
+                        <!-- <el-button class="but"
                             :type="scope.row.examineState === 2 ? 'primary' : scope.row.examineState === 1 ? 'primary' : ''"
                             :disabled="scope.row.examineState === 2 ? true : scope.row.examineState === 1 ? false : true"
                             @click="openModifyWorkDialog(scope.row)">
                             修改
                         </el-button>
                         <el-button class="but" type="danger" @click="handleDelete(scope.row.id, scope.$index)">删除
-                        </el-button>
+                        </el-button> -->
                     </template>
                 </el-table-column>
             </el-table>

nngkxxdp/src/main/resources/static/yxnaht/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Vue App</title><link href="css/app.ad728a6d.css" rel="preload" as="style"><link href="css/chunk-vendors.058a81fe.css" rel="preload" as="style"><link href="js/app.9246518e.js" rel="preload" as="script"><link href="js/chunk-vendors.4c187b39.js" rel="preload" as="script"><link href="css/chunk-vendors.058a81fe.css" rel="stylesheet"><link href="css/app.ad728a6d.css" rel="stylesheet"></head><body><div id="app"></div><script src="js/chunk-vendors.4c187b39.js"></script><script src="js/app.9246518e.js"></script></body></html>
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Vue App</title><link href="css/app.9eaba678.css" rel="preload" as="style"><link href="css/chunk-vendors.058a81fe.css" rel="preload" as="style"><link href="js/app.09020e51.js" rel="preload" as="script"><link href="js/chunk-vendors.4c187b39.js" rel="preload" as="script"><link href="css/chunk-vendors.058a81fe.css" rel="stylesheet"><link href="css/app.9eaba678.css" rel="stylesheet"></head><body><div id="app"></div><script src="js/chunk-vendors.4c187b39.js"></script><script src="js/app.09020e51.js"></script></body></html>