Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.4

.env.development

@@ -15,9 +15,9 @@ ENV = 'development'
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 #景远超
 # VUE_APP_BASE_API = 'http://10.87.11.173:8080'
-#VUE_APP_BASE_API = 'http://localhost:8080'
+VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
-VUE_APP_BASE_API = 'http://10.87.21.107:8080'
+# VUE_APP_BASE_API = 'http://10.87.21.107:8080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 

src/views/resumptionEvaluate/evaluate/index.vue

@@ -170,7 +170,7 @@
                   size="mini"
                   @click="publishHandler(row)"
                   type="text"
-                  v-if="row.orgId == isEdit"
+                  v-if="row.orgId == isEdit &&row.status==0"
                   :class="
                     row.isDistribute == 0
                       ? 'el-icon-arrow-down'

src/views/safetyBook/aqbwbndjh/dialog.edit.vue

@@ -91,6 +91,7 @@
 
 <script>
 import { mapState, mapMutations } from "vuex";
+import { mapGetters } from "vuex";
 import { Add, edit, getaqbwbndjh } from "@/api/safetyBook/aqbwbndjh";
 import { deptTreeSelect } from "@/api/system/public";
 import UserSelector from "@/components/userSelector/index.vue";
@@ -120,6 +121,7 @@ export default {
   watch: {},
   computed: {
     ...mapState([]),
+    ...mapGetters(["orgId", "orgName"]),
     joinedStringArray: {
       get() {
         if (this.formData.names == null || this.formData.names == undefined) {
@@ -182,6 +184,12 @@ export default {
       this.formData = this.reset();
       this.id = id;
       await this.refresh(id);
+      if(id){
+        
+      }else{
+        // console.log(this.orgId,"this.orgId")
+        this.formData.orgId=this.orgId;
+      }
       this.isShow = true;
     },
 

src/views/safetyBook/dialog.edit.vue

@@ -22,7 +22,7 @@
               :options="deptOptions"
               :show-count="true"
               :normalizer="tenantIdnormalizer"
-              :props="{ checkStrictly: true, label: 'name' }"
+              :props="{ checkStrictly: true, label: 'shortName' }"
               placeholder="请选择签署人所在机构"
               
             />

src/views/safetyBook/hsggbsdj/dialog.edit.vue

@@ -88,6 +88,7 @@
 
 <script>
 import { mapState, mapMutations } from "vuex";
+import { mapGetters } from "vuex";
 import { Add, edit, gethsggbsdj } from "@/api/safetyBook/hsggbsdj";
 import { deptTreeSelect } from "@/api/system/public";
 import UserSelector from "@/components/userSelector/index.vue";
@@ -117,6 +118,7 @@ export default {
   watch: {},
   computed: {
     ...mapState([]),
+    ...mapGetters(["orgId", "orgName"]),
     joinedStringArray: {
       get() {
         if (this.formData.names == null || this.formData.names == undefined) {
@@ -177,6 +179,12 @@ export default {
       this.formData = this.reset();
       this.id = id;
       await this.refresh(id);
+      if(id){
+        
+      }else{
+        // console.log(this.orgId,"this.orgId")
+        this.formData.orgId=this.orgId;
+      }
       this.isShow = true;
     },