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

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -128,7 +128,7 @@
                   </el-radio-group>
                   <el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
                 </el-form-item>
-                <el-form-item v-show="form.standInData=='0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
+                <el-form-item v-show="form.standInData=='1'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
                   <el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
                   <tree-select-new
                     :key="key"

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

@@ -1471,6 +1471,9 @@ export default {
 @import '~@/assets/styles/style';
 
 .xmqdqr-step1 {
+  .el-checkbox {
+    display: block!important;
+  }
   position: relative;
   height: 100%;
   .myForm {
@@ -1542,4 +1545,11 @@ export default {
   }
 }
 </style>
+<style lang="less">
+  .xmqdqr-step1 {
+    .el-checkbox {
+      display: block !important;
+    }
+  }
+</style>
 

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -145,23 +145,30 @@
           </el-table-column>
         </el-table-column>
         <el-table-column
-                prop="deptName"
+          prop="deptName"
-                align="center"
+          align="center"
-                label="提出部门"
+          label="提出部门"
-                width="170"
+          width="170"
         >
         </el-table-column>
         <el-table-column
-                prop="userName"
+          prop="userName"
-                align="center"
+          align="center"
-                width="100"
+          width="100"
-                label="提出人"
+          label="提出人"
         >
         </el-table-column>
         <el-table-column
-                prop="state"
+          prop="sourceType"
-                align="center"
+          align="center"
-                label="处理意见">
+          width="100"
+          label="来源"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="state"
+          align="center"
+          label="处理意见">
           <template slot-scope="scope">
             <div>{{ stateText(scope.row.state) }}</div>
           </template>
@@ -257,18 +264,19 @@
 </template>
 
 <script>
-  import { mapGetters } from 'vuex';
+import { mapGetters } from "vuex";
-  export default {
+
-    name: 'consultationDetails',
+export default {
-    data() {
+  name: "consultationDetails",
-      return {
+  data() {
-        freshClueNum: '',
+    return {
-        itermsConditionsFlag: false,
+      freshClueNum: "",
-        itermsConditionsTitle: '',
+      itermsConditionsFlag: false,
-        options: [],
+      itermsConditionsTitle: "",
-        fileInfoList: [],
+      options: [],
-        fileInfoLists: [],
+      fileInfoList: [],
-        itemData: this.lawsStand,
+      fileInfoLists: [],
+      itemData: this.lawsStand,
         id: '', // 选中id
         type: '', // 选中状态
         spinShow: false,