Merge remote-tracking branch 'origin/develop' into develop

src/components/CustomFormComponents/InputForStandardsForEnterprise.vue

@@ -124,7 +124,7 @@
           width="130">
         </el-table-column>
         <el-table-column
-          prop="standStateShow"
+          prop="standStatusShow"
           label="文本状态"
           width="130">
         </el-table-column>

src/components/CustomFormComponents/InputForStandardsForForeign.vue

@@ -112,9 +112,14 @@
           width="130">
         </el-table-column>
         <el-table-column
-          prop="standStateShow"
-          label="标准状态"
+          prop="textStatus"
+          label="文本状态"
           width="130">
+          <template slot-scope="scope">
+            <span>
+              {{ textStatusMap[scope.row.textStatus] }}
+            </span>
+          </template>
         </el-table-column>
       </el-table>
       <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -178,6 +183,8 @@ export default {
   },
   data() {
     return {
+      textStatus:'',//文本状态
+      textStatusMap: {}, // 文本状态id与name对应
       replaceLawsNumModel: false,
       sarBussionessLawsEO: {
         replaceLawsNum: ''
@@ -213,6 +220,12 @@ export default {
     }
   },
   methods: {
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label)
+      })
+    },
     handleChange (event) {
       // const value = event.target.value
       const value = event
@@ -336,6 +349,17 @@ export default {
       this.getReplaceLawsNumRow()
     }
   },
+  async mounted () {
+    // 从数据库中查询各下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this
+    }, res => {
+      this.standStateOptions = res.data.WBZTCLASS // 文本状态
+      this.setMap(this.standStateOptions)
+    }, e => {
+      console.log("error");
+    })
+  },
   watch: {
     dataSourceFrom: {
       handler (val) {

src/pages/config/pages/mechanismManage/index.vue

@@ -27,6 +27,32 @@
     </div>
     <div class="tree-right">
       <div class="content">
+        <!--搜索区域-->
+        <div class="search-area">
+          <el-form inline class="label-input-form" v-model="searchForm">
+            <el-form-item label="姓名" class="search-item">
+              <el-input placeholder="根据姓名查询" clearable v-model="searchForm.uname">
+
+              </el-input>
+            </el-form-item>
+            <el-form-item label="邮箱" class="search-item">
+              <el-input placeholder="根据邮箱查询" clearable v-model="searchForm.email">
+
+              </el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" size="mini"
+                         class="common-button-primary" @click="getData">
+                查询
+              </el-button>
+            </el-form-item>
+            <el-form-item>
+              <el-button size="mini" class="common-button-default" @click="clearAllSearch">
+                清空
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </div>
         <el-table
           ref="multipleTable"
           :data="data"
@@ -140,6 +166,10 @@ export default {
   name: 'MechanismManage',
   data () {
     return {
+      searchForm: {
+        uname:"",
+        email:""
+      },
       userId: '',
       postList: [],
       props: {
@@ -165,6 +195,13 @@ export default {
     }
   },
   methods: {
+    clearAllSearch() {
+      this.searchForm = {
+        uname: "",
+        email: ""
+      }
+      this.getData()
+    },
     resetFormPost () {
       this.modalPost= false
     },
@@ -247,12 +284,15 @@ export default {
       })
     },
     getData () {
-      this.$http.get('SarInstitution/institution/user', {
-        institutionId: this.id
+      this.$http.post('SarInstitution/institution/user', {
+        institutionId: this.id,
+        uname: this.searchForm.uname,
+        email: this.searchForm.email
       }, {
         _this: this,
         loading: 'Loading'
       }, res => {
+        console.log(res.data)
         res.data.forEach((item) => {
           var NameList = ''
           item.positions.forEach((items) => {

src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue

@@ -731,10 +731,12 @@ export default {
                     }
                   });
                 } else {
+                  this.isSubmit = false
                   return this.$message.warning("请完善人员信息");
                 }
               });
             } else {
+              this.isSubmit = false
               return this.$message.warning("请完善基础信息");
             }
           });

src/pages/processCenter/pages/creatProcess/xmpg/step1.vue

@@ -705,10 +705,12 @@ export default {
                     }
                   });
                 } else {
+                  this.isSubmit = false;
                   return this.$message.warning("请完善人员信息");
                 }
               });
             } else {
+              this.isSubmit = false;
               return this.$message.warning("请完善基础信息");
             }
           });

src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue

@@ -354,9 +354,13 @@ export default {
           this.qdform.prcNum = this.prcNum;
           this.qdform.prcName = this.prcName;
           this.qdform["id"] = item.id;
+          this.projectId = item.projectId
+          this.getStandData();
         }else{
           this.qdform = item.form
           this.dataList =item.form.dataList
+          this.projectId = item.form.projectId
+          this.getStandData();
         }
       });
     },

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -1935,9 +1935,9 @@ export default {
           {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
           // {validator: this.verify.valiateEnName, trigger: 'blur'}
         ],
-        // standState: [
-        //   {required: true, message: '标准状态不能为空', trigger: 'change'}
-        // ],
+        standState: [
+         {required: true, message: '文本状态不能为空', trigger: 'change'}
+         ],
         replaceStandNum: [
           {type: 'string', max: 100, message: '代替标准编号不能超过100个字符', trigger: 'change'}
         ],
@@ -2196,7 +2196,7 @@ export default {
       data.forEach(item => {
         this.$set(this.textStatusMap, item.value, item.label)
       })
-      console.log(this.textStatusMap, '文本状态的值')
+      console.log(this.textStatusMap, '外面的文本状态的值')
     },
       busVsFunc(){
           this.$http.get('sarVppsTree/list', '', {