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

2021-12-30 17:48:29 +08:00
parent 0bbe1a0b5d 021af1806d
commit bb64874a2e
39 changed files with 44 additions and 42 deletions
@@ -395,7 +395,7 @@
                    this.roleForm.presidentUserName = data[0].name
                }
            },
-            choiceZRRS () {
+            choiceZRRS (type) {
                this.type2 = type
                this.nodeList2 = []
                if (type === '1') {
@@ -69,7 +69,7 @@
                <el-button :disabled="!itemList.length" type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
            </div>
            <el-table border
-                      ref="selection"
+                      ref="selections"
                      :data="itemList"
                      tooltip-effect="dark"
                      style="width: 100%;"
@@ -378,7 +378,7 @@
                if (type === 1) {
                    this.drawerTitle = '选择执行人'
                    this.nodeList2 = []
-                    this.zxIndex= index
+                    this.zxIndex = index
                    this.nodeList2.push(row)
                    this.modalshowflag2 = true
                } else {
@@ -415,6 +415,7 @@
                    }
                }
                this.modalshowflag = false
+               this.$refs.selections.clearSelection()
            },
            handleTabs(name) {
                this.active = name
@@ -1330,7 +1330,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                  standEnName: [
                    { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -920,7 +920,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -920,7 +920,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -920,7 +920,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1001,7 +1001,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1001,7 +1001,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -923,7 +923,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -986,7 +986,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -920,7 +920,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -940,7 +940,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -987,7 +987,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1014,7 +1014,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -920,7 +920,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -920,7 +920,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -978,7 +978,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -987,7 +987,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -916,7 +916,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -934,7 +934,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -933,7 +933,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -923,7 +923,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -924,7 +924,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -986,7 +986,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -929,7 +929,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1044,7 +1044,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1028,7 +1028,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1060,7 +1060,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1063,7 +1063,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1063,7 +1063,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -985,7 +985,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1028,7 +1028,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -918,7 +918,7 @@
                    standName: [
                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    standEnName: [
                        { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1252,7 +1252,7 @@
                    lawsName: [
                        {required: true, message: '中文名称不能为空', trigger: 'change'},
                        {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'},
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    lawsEnName: [
                        {required: false, message: '英文名称不能为空', trigger: 'change'},
@@ -1302,7 +1302,7 @@
                    lawsName: [
                        {required: true, message: '中文名称不能为空', trigger: 'change'},
                        {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'},
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                    ],
                    lawsEnName: [
                        {required: false, message: '英文名称不能为空', trigger: 'change'},
@@ -190,7 +190,7 @@
      <el-divider content-position="left"><h2>企业标准相关流程</h2></el-divider>
      <div class="process-box">
        <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'7a53ef593e5401aab19485b937ce78a0'">
+          <el-card shadow="hover" v-btn-permission="''">
            <div class="card-box" @click="handleCreateProcess('buss1')">
              <div class="card-top">
                <div class="card-top-left">
@@ -375,7 +375,7 @@
                     @click="exportTestItem">提交</el-button>
        </span>
      </el-dialog>
-      <!-- 新增国内标准 -->
+      <!-- 编辑国内标准 -->
      <el-drawer
          :title="modalshowtitle"
          :visible.sync="modalshowflag"
@@ -285,8 +285,9 @@
         fontWeight: 'bold', height: '48px'}"
          @selection-change="standSelectChange"
        >
+<!--          v-if="isPermission('374205ce36a859a158ca4db196d151b7,784d26f527a659eefe84d5e5a53deb96,2d41ebdb6150ba1af52fd753086d77dc')>0"-->
+
          <el-table-column
-              v-if="isPermission('374205ce36a859a158ca4db196d151b7,784d26f527a659eefe84d5e5a53deb96,2d41ebdb6150ba1af52fd753086d77dc')>0"
            type="selection"
              min-width="5%"
            align="center">
@@ -1918,7 +1919,7 @@ export default {
        standName: [
          {required: true, message: '中文名称不能为空', trigger: 'change'},
          {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'},
-          {validator: this.verify.valiateName, trigger: 'change'}
+          {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
        ],
        standEnName: [
          {required: true, message: '英文名称不能为空', trigger: 'change'},
@@ -1817,7 +1817,7 @@
          lawsName: [
            {required: true, message: '中文名称不能为空', trigger: 'change'},
            {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'},
-            {validator: this.verify.valiateName, trigger: 'change'}
+            {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
          ],
          lawsEnName: [
            {required: false, message: '英文名称不能为空', trigger: 'change'},
@@ -1859,7 +1859,7 @@
          lawsName: [
            {required: true, message: '中文名称不能为空', trigger: 'change'},
            {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'},
-            {validator: this.verify.valiateName, trigger: 'change'}
+            {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
          ],
          lawsEnName: [
            {required: false, message: '英文名称不能为空', trigger: 'change'},