Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

src/components/CustomFormComponents/File.vue

@@ -255,7 +255,7 @@ export default {
     uploadSuccess(res, file, fileList) {
       if (res.ok) {
         // this.value += res.data.id + ','
-        this.$emit('input', this.value ? this.value + ',' : this.value+ res.data.id + ',')
+        this.$emit('input', this.value ? this.value + ','+ res.data.id + ',' : this.value+ res.data.id + ',')
         this.$emit('success')
         this.$message({
           message: '文件上传成功',

src/pages/config/pages/attributeCustom/components/stand.vue

@@ -3,7 +3,7 @@
   <div class="attribute-custom v-class">
     <div class="action-bar1">
       <el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
-      <el-button class="common-button-default" size="mini" v-btn-permission="''" @click="showDisplayLocationDialog">展示区域管理</el-button>
+      <el-button class="common-button-default" size="small" v-btn-permission="''" @click="showDisplayLocationDialog">展示区域管理</el-button>
     </div>
     <loading :loading="attributeDataLoading">数据处理中</loading>
     <div class="content">
@@ -188,8 +188,8 @@
         </el-form>
       </div>
       <div id="roleFormButton" class="demo-drawer-footer">
-        <el-button class="common-button-primary" icon="el-icon-check" type="primary" @click="saveInfo()">提交</el-button>
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveInfo()">提交</el-button>
-        <el-button class="common-button-default" icon="el-icon-close" @click="cancelModel">取消</el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelModel">取消</el-button>
       </div>
     </el-drawer>
 
@@ -199,7 +199,7 @@
       width="400px"
     >
       <div style="margin-bottom: 10px;">
-        <el-button class="common-button-primary add-button" v-btn-permission="'e128da8f053dd19113e75772f2c70f29'" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)">新增</el-button>
+        <el-button size="mini" class="common-button-primary add-button" v-btn-permission="'e128da8f053dd19113e75772f2c70f29'" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)">新增</el-button>
       </div>
       <el-table
         :loading="displayLocationDialogTableConfig.loading"
@@ -269,12 +269,12 @@
           </el-select>
         </el-form-item>
         <el-form-item label="排序号" prop="showIndex" class="add-form-item">
-          <el-input v-model.number="displayLocationDialogFormData.showIndex" placeholder="请输入排序号"></el-input>
+          <el-input v-model="displayLocationDialogFormData.showIndex" placeholder="请输入排序号"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button class="common-button-default" @click="handleDisplayLocationFormDialogReset('displayLocationDialogForm')">取 消</el-button>
+        <el-button size="mini" class="common-button-default" @click="handleDisplayLocationFormDialogReset('displayLocationDialogForm')">取 消</el-button>
-        <el-button class="common-button-primary" type="primary" @click="handleDisplayLocationFormDialogSubmit('displayLocationDialogForm')">确 定</el-button>
+        <el-button size="mini" class="common-button-primary" type="primary" @click="handleDisplayLocationFormDialogSubmit('displayLocationDialogForm')">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -319,6 +319,7 @@ export default {
       },
       displayLocationDialogFormData: {
         areaName: '',
+        sarType: '',
         showIndex: ''
       },
       displayLocationDialogFormRules: {
@@ -330,8 +331,9 @@ export default {
           {required: true, message: '所属模块不能为空', trigger: 'change'}
         ],
         showIndex: [
-          { type: 'number', required: true, message: '不能为空且为正整数', trigger: 'blur' },
+          { required: true, message: '排序号不能为空且为正整数', trigger: 'blur'},
-          { type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
+          { type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'},
+          { min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
         ]
       },
       attributeDataLoading: false,

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

@@ -320,56 +320,6 @@
                 @checkedRole="saveUserInfo"
                 :nodeList="nodeList"
         ></Role-tree>
-<!--        <el-drawer-->
-<!--                :title="drawerTitle"-->
-<!--                :visible.sync="modalshowflag"-->
-<!--                :wrapperClosable="false"-->
-<!--                size="800px">-->
-<!--            <el-tree-->
-<!--                    v-if="modalshowflag"-->
-<!--                    node-key="id"-->
-<!--                    style="height: 100%; overflow: auto;"-->
-<!--                    class="filter-tree"-->
-<!--                    :data="treeData"-->
-<!--                    :props="defaultProps"-->
-<!--                    :default-checked-keys="nodeList"-->
-<!--                    highlight-current-->
-<!--                    check-strictly-->
-<!--                    @check="drawerCheck"-->
-<!--                    :expand-on-click-node="false"-->
-<!--                    show-checkbox-->
-<!--                    ref="tree">-->
-<!--            </el-tree>-->
-<!--            <div id="roleFormButton" class="demo-drawer-footer">-->
-<!--                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>-->
-<!--                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>-->
-<!--            </div>-->
-<!--        </el-drawer>-->
-<!--        <el-drawer-->
-<!--                title="选择责任部门对接人"-->
-<!--                :visible.sync="modalshowflag2"-->
-<!--                :wrapperClosable="false"-->
-<!--                size="800px">-->
-<!--            <el-tree-->
-<!--                    v-if="modalshowflag2"-->
-<!--                    node-key="id"-->
-<!--                    style="height: 100%; overflow: auto;"-->
-<!--                    class="filter-tree"-->
-<!--                    :data="treeData"-->
-<!--                    :props="defaultProps"-->
-<!--                    :default-checked-keys="nodeList2"-->
-<!--                    highlight-current-->
-<!--                    check-strictly-->
-<!--                    @check="drawerCheck2"-->
-<!--                    :expand-on-click-node="false"-->
-<!--                    show-checkbox-->
-<!--                    ref="tree2">-->
-<!--            </el-tree>-->
-<!--            <div id="roleFormButton2" class="demo-drawer-footer">-->
-<!--                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>-->
-<!--                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>-->
-<!--            </div>-->
-<!--        </el-drawer>-->
     </div>
 </template>
 

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -4,7 +4,7 @@
     <div class="tree-content" :class="{ 'tree-closed': sideClose }">
       <div class="tree">
         <el-input
-            placeholder="输入国内标准法规"
+            placeholder="输入树状图体系"
             v-model="filterText">
         </el-input>
         <el-tree