Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

.env.development

@@ -13,9 +13,9 @@ ENV = 'development'
 #VUE_APP_BASE_API = 'http://10.87.10.47:8080'
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
-# VUE_APP_BASE_API = 'http://localhost:8080'
+VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
-VUE_APP_BASE_API = 'http://10.87.10.55:8080'
+# VUE_APP_BASE_API = 'http://10.87.10.55:8080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/assets/styles/sidebar.scss

@@ -189,6 +189,10 @@
     }
   }
 }
+/* 用于遮盖elementui下拉框的悬浮框*/
+.vue-treeselect__menu-container{
+  z-index: 3000 !important;
+}
 
 // when menu collapsed
 .el-menu--vertical {

src/views/core/message/index.vue

@@ -100,6 +100,7 @@
               @click="lookThisOne(scope.row)"
               v-hasPermi="['core:notification:query']"
             >详情</el-button>
+            <div v-if="loginOrgId==scope.row.orgId">
             <el-button
               size="mini"
               type="text"
@@ -128,6 +129,7 @@
               v-hasPermi="['core:notification:cancelPublish']"
               v-if="scope.row.messagStatus=='1'"
             >取消发布</el-button>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -187,7 +189,7 @@
           <el-input v-model="form.content" type="textarea" placeholder="请输入内容" :disabled="!isSubmit" :autosize="{ minRows: 6, maxRows: 10}" :maxlength="2000" show-word-limit/>
         </el-form-item>
         <el-form-item label="附件" prop="fileList">
-          <K-file-upload ref="upload" :defaultValue="formFileListDefualtValue" :disabled="!isSubmit" v-model="form.fileList"/>
+          <K-file-upload ref="upload" :defaultValue="formFileListDefualtValue" :disabled="!isSubmit"  :isShowUploadBtn="!isSubmit? false:true" v-model="form.fileList"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -230,17 +232,20 @@ export default {
       // 是否显示弹出层
       open: false,
       orgId:null,
+      loginOrgId:null,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         title: null,
         dateRange: [],
-        messagStatus: null
+        messagStatus: null,
+        checkSub:true
       },
       isShow:false,
       isSubmit:true,
       roleList: [],
+      roleListInit: [],
       formFileListDefualtValue: [],
       // 表单参数
       form: {},
@@ -255,9 +260,11 @@ export default {
     };
   },
   created() {
+    this.orgId = this.$store.getters.orgId;
+    this.loginOrgId = this.$store.getters.orgId;
+    this.queryParams.orgId = this.$store.getters.orgId;
     this.getList();
     this.initRoleList();
-    this.orgId = this.$store.getters.orgId;
   },
   methods: {
     /** 查询公告通知列表 */
@@ -272,8 +279,8 @@ export default {
     getRolename(roleIds){
       if(roleIds!=null && roleIds.length>0){
         return roleIds.map(v => {
-          if(this.roleList.find(item => item.id === v)){
-            return this.roleList.find(item => item.id === v).name
+          if(this.roleListInit.find(item => item.id === v)){
+            return this.roleListInit.find(item => item.id === v).name
           }else {
             return "";
           }
@@ -290,6 +297,7 @@ export default {
       //this.roleList=[];
       this.reset();
       this.isSubmit=true;
+      this.isShow=false;
     },
     handleClose(){
       this.cancel();
@@ -461,6 +469,7 @@ export default {
       this.form.tagRoleIds = [];
       roleList(query).then(response => {
         this.roleList = response.data;
+        this.roleListInit = response.data;
       });
     },
 

src/views/system/bind/index.vue

@@ -441,9 +441,3 @@ export default {
   }
 };
 </script>
-
-<style lang="scss">
-.vue-treeselect__menu-container{
-  z-index: 3000 !important;
-}
-</style>

src/views/system/dept/extend.vue

@@ -1273,7 +1273,7 @@ export default {
   },
   watch: {
     "detachedform.certificateEvidence"(newValue) {
-      if (newValue === 1) {
+      if (newValue === 1&&this.detachedform.certificate==null&&this.detachedimgs.length==0) {
         this.reqmsg = true;
       }
       if (newValue === 0) {
@@ -1281,7 +1281,9 @@ export default {
       }
     },
     "Bankform.certificateEvidence"(newValue) {
-      if (newValue === 1) {
+      // console.log(this.Bankimgs.length,"this.imgs")
+      // console.log(this.Bankform.certificate,"Bankform.certificate")
+      if (newValue === 1&&this.Bankform.certificate==null&&this.Bankimgs.length==0) {
         this.reqmsg = true;
       }
       if (newValue === 0) {
@@ -1289,7 +1291,7 @@ export default {
       }
     },
     "Businessform.certificateEvidence"(newValue) {
-      if (newValue === 1) {
+      if (newValue === 1&&this.Businessform.certificate==null&&this.Businessimgs.length==0) {
         this.reqmsg = true;
       }
       if (newValue === 0) {
@@ -1297,7 +1299,7 @@ export default {
       }
     },
     "orgform.certificateEvidence"(newValue) {
-      if (newValue === 1) {
+      if (newValue === 1&&this.orgform.certificate==null&&this.orgimgs.length==0) {
         this.reqmsg = true;
       }
       if (newValue === 0) {
@@ -1345,7 +1347,7 @@ export default {
     // },
     getImgUrl(img) {
       this.imgs.push(img);
-      console.log(this.imgs, "imgs");
+      // console.log(this.imgs, "imgs");
     },
     getAreaList() {
       selectCityInfoVoList({}).then((response) => {
@@ -1365,15 +1367,19 @@ export default {
     //证书上传
     uploadBusinessSuccess(img) {
       this.Businessimgs.push(img);
+      this.reqmsg = false;
     },
     uploadBankSuccess(img) {
       this.Bankimgs.push(img);
+      this.reqmsg = false;
     },
     uploadorgSuccess(img) {
       this.orgimgs.push(img);
+      this.reqmsg = false;
     },
     uploaddetachedSuccess(img) {
       this.detachedimgs.push(img);
+      this.reqmsg = false;
     },
 
     handleInput() {
@@ -1539,13 +1545,14 @@ export default {
       getOrgPhysicalDefenseConstruction(id).then((response) => {
         // console.log(response.data,"response.data")
         this.Businessform = response.data;
+        // this.Businessform.certificateEvidence=parseInt(response.data.certificateEvidence);
         this.Businessopen = true;
         this.Businesstitle = "编辑安全防范设施建设达标情况";
       });
     },
     /** 提交按钮 */
     submitBusinessForm() {
-      if(this.Businessimgs.length>1){
+      if(this.Businessimgs.length>0){
         this.Businessform.certificate= this.Businessimgs[this.Businessimgs.length - 1].toString(",");
       }
      
@@ -1573,6 +1580,7 @@ export default {
               }
             );
           }
+          this.Businessimgs=[];
         } else {
           // 表单验证未通过，显示错误信息
         }
@@ -1632,6 +1640,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleBankAdd() {
+      
       this.Bankreset();
       this.Bankopen = true;
       this.Banktitle = "新增安全防范设施建设达标情况";
@@ -1642,13 +1651,14 @@ export default {
       const id = row.id || this.Bankids;
       getOrgPhysicalDefenseConstruction(id).then((response) => {
         this.Bankform = response.data;
+        // this.Bankform.certificateEvidence=parseInt(response.data.certificateEvidence);
         this.Bankopen = true;
         this.Banktitle = "编辑安全防范设施建设达标情况";
       });
     },
     /** 提交按钮 */
     submitBankForm() {
-      if(this.Bankimgs.length>1){
+      if(this.Bankimgs.length>0){
         this.Bankform.certificate= this.Bankimgs[this.Bankimgs.length - 1].toString(",");
       }
 
@@ -1676,11 +1686,12 @@ export default {
               }
             );
           }
+          this.Bankimgs = [];
         } else {
           // 表单验证未通过，显示错误信息
         }
       });
-
+      
       // this.$refs["Bankform"].validate((valid) => {
       //   if (valid) {
 
@@ -1743,13 +1754,15 @@ export default {
       const id = row.id || this.detachedids;
       getOrgPhysicalDefenseConstruction(id).then((response) => {
         this.detachedform = response.data;
+        // this.detachedform.certificateEvidence=parseInt(response.data.certificateEvidence);
         this.detachedopen = true;
+        
         this.detachedtitle = "编辑安全防范设施建设达标情况";
       });
     },
     /** 提交按钮 */
     submitdetachedForm() {
-      if(this.detachedimgs.length>1){
+      if(this.detachedimgs.length>0){
         this.detachedform.certificate= this.detachedimgs[this.detachedimgs.length - 1].toString(",");
       }
 
@@ -1768,6 +1781,7 @@ export default {
                 this.getdetachedPhysicalDefenseConstructionInfo();
               }
             );
+            
           } else {
             addOrgPhysicalDefenseConstruction(this.detachedform).then(
               (response) => {
@@ -1777,6 +1791,7 @@ export default {
               }
             );
           }
+          this.detachedimgs=[];
         } else {
           // 表单验证未通过，显示错误信息
         }
@@ -1809,7 +1824,7 @@ export default {
         id: null,
         standard: null,
         dateOfCompliance: null,
-        certificateEvidence: null,
+        certificateEvidence: 0,
         certificate: null,
         evidence: null,
         createTime: null,
@@ -1843,18 +1858,24 @@ export default {
       this.orgreset();
       const id = row.id || this.orgids;
       getOrgPhysicalDefenseConstruction(id).then((response) => {
-        // console.log(response)
+        
         this.orgform = response.data;
         this.orgopen = true;
+        // console.log(response.data.certificateEvidence,"response.data.certificateEvidence")
+        //  this.orgform.certificateEvidence=parseInt(response.data.certificateEvidence);
+        // console.log(this.orgform,"this.orgform")
         this.orgtitle = "编辑安全防范设施建设达标情况";
       });
     },
     /** 提交按钮 */
     submitOrgForm() {
-      if(this.orgimgs.length>1){
+      // console.log(this.orgimgs,"this.orgimgs")
+      // console.log(this.orgform.certificate,"this.orgform.certificate")
+      if(this.orgimgs.length>0){
         this.orgform.certificate= this.orgimgs[this.orgimgs.length - 1].toString(",");
       }
-      
+      // console.log(this.orgimgs,"this.orgimgs1")
+      // console.log(this.orgform.certificate,"this.orgform.certificate1")
       this.$refs.orgform.validate((valid) => {
         if (valid) {
           // 表单验证通过，提交数据或执行其他操作
@@ -1876,6 +1897,7 @@ export default {
               this.getOrgPhysicalDefenseConstructionInfo();
             });
           }
+          this.orgimgs=[];
         } else {
           // 表单验证未通过，显示错误信息
         }
@@ -1931,17 +1953,20 @@ export default {
       if (this.extendId) {
         updateExtend(dat).then((res) => {
           this.$modal.msgSuccess("保存成功");
-          this.$router.go(-1);
+          // this.$router.go(-1);
+          this.$tab.closePageAndPushPrev();
         });
       } else {
         addExtend(dat).then((res) => {
           this.$modal.msgSuccess("保存成功");
-          this.$router.go(-1);
+          // this.$router.go(-1);
+          this.$tab.closePageAndPushPrev();
         });
       }
     },
     nosaveExtend() {
-      this.$router.go(-1);
+      // this.$router.go(-1);
+      this.$tab.closePageAndPushPrev();
     },
     triggerFileInput() {
       this.$refs.fileInput.click();