From ef96c620dc62d3238e1d2a9f4930b1f0e8c6c3e6 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 2 Sep 2021 16:17:00 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E5=9B=9E=E9=80=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/wfhxzg/step2.vue       |  5 +++++
 .../pages/creatProcess/wfhxzg/step3.vue       | 22 +++++--------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
index 7f5b9561e..a26fc9188 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
@@ -240,6 +240,7 @@ export default {
   name: "wfhxzgStep2",
   data() {
     return {
+      passInfo: 0,
       detailData: [],
       loading: false,
       textarea: '', // 意见
@@ -336,6 +337,9 @@ export default {
     },
     getFormFieldList (item) {
       this.$nextTick(() => {
+        if (item.passInfo !== undefined) {
+          this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
+        }
         this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
         this.textarea = JSON.parse(JSON.stringify(item)).commentText
       })
@@ -406,6 +410,7 @@ export default {
       }
       let json = {
         dockUserList: list,
+        passInfo: this.passInfo
       }
       let flag=false
       this.dataList.forEach(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
index cec18bcd1..be1ddaff0 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -247,6 +247,7 @@ export default {
   name: "wfhxzgStep3",
   data() {
     return {
+      passInfo: 0,
       detailData: [],
       loading: false,
       commentText: '', // 意见
@@ -320,6 +321,9 @@ export default {
     },
     getFormFieldList (item) {
       this.$nextTick(() => {
+        if (item.passInfo !== undefined) {
+          this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
+        }
         let fileData = JSON.parse(JSON.stringify(item)).dockUserList
         for (let i = 0; i<fileData.length; i++) {
           if (fileData[i].name === this.$store.getters.userInfo.userName) {
@@ -358,11 +362,11 @@ export default {
       if (this.commentText) {
 
         var json = {
+          passInfo: 1,
           actionFlag: 1,
           commentText: this.commentText,
           standardInfoList: this.standardInfoList,
         }
-        this.isSubmit = true
         const params = new FormData();
         params.set('json', JSON.stringify(json))
         params.set('userId', this.$store.getters.userInfo.userId)
@@ -372,25 +376,10 @@ export default {
             this.$message.success('驳回成功')
             this.$router.push('/processCenter')
           }
-          this.isSubmit = false
         })
        } else {
           this.$message.warning('请输入反馈意见')
          }
-/*        this.$http.post('lawss/activiti/completeTask', {
-          json: JSON.stringify(json),
-          taskId: this.taskIds,
-          userId: this.$store.getters.userInfo.userId
-        }, {}, res => {
-          if (res.success) {
-            this.$message.success('驳回成功')
-            this.$router.push('/processCenter')
-          }
-          this.isSubmit = false
-        })
-      } else {
-        this.$message.warning('请输入反馈意见')
-      }*/
     },
     // 点击查看
     handlePreview (item) {
@@ -468,6 +457,7 @@ export default {
         list.push(item[1])
       }
       let json = {
+        passInfo: this.passInfo,
         responUserList: list,
         actionFlag: 0
       }

From cb9513fb45905e34f00a700dea9cd862ae3a768f Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 2 Sep 2021 16:51:24 +0800
Subject: [PATCH 02/13] commit

---
 src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index 5ea4fe86e..bf5ddd7f1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -289,7 +289,7 @@
                       @selection-change="handleSelection2"
                       :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
                 <el-table-column type="selection" width="55" align="center"/>
-                <el-table-column label="附件名" align="center" prop="fileName"></el-table-column>
+                <el-table-column label="附件名" align="center" prop="fileOldName"></el-table-column>
               </el-table>
             </div>
           </div>

From 08237cbf1fbb9cd9413084004457300dc69d2beb Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 2 Sep 2021 18:02:48 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localProductsOrProjectLibrary/index.vue                   | 2 ++
 .../localProductsOrProjectLibrary/pages/details.vue           | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index f5c7c0a1d..aaef03de8 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -1377,10 +1377,12 @@ export default {
       }, {
         _this: this, loading: "loading"
       }, res => {
+        this.detailedListVersion = res.data[0].detailedListVersion
         if (res.data) {
           this.$router.push({
             name: "LocalProductDetail",
             query: {
+              detailedListVersion: this.detailedListVersion,
               tabName: this.ifMaintaince
             }
           });
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index c5ea2c3d1..05a392fc9 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -47,7 +47,7 @@
       <div class="action-bar">
         <el-row>
           <el-col :span="12">
-            <span style="font-size: 16px;font-weight: bold">清单版本: {{  }}</span>
+            <span style="font-size: 16px;font-weight: bold">清单版本: {{ detailedListVersion ? $moment(detailedListVersion).format('YYYY-MM-DD HH:mm:ss') : '-' }}</span>
           </el-col>
           <el-col :span="12" style="text-align: end">
             <el-button
@@ -473,6 +473,7 @@ export default {
   },
   data() {
     return {
+      detailedListVersion: '',
       standSortOptions: [],
       standCommonlySearch: {
         standSort: '',
@@ -959,6 +960,7 @@ export default {
     ...mapGetters(['getLocalPro'])
   },
   mounted() {
+    this.detailedListVersion = this.$route.query.detailedListVersion
     this.$nextTick(() => {
       this.Height = $('.contaiiner').height() - $('.contaiinerCard').height() - 190
       window.onresize = () => {

From 47da0d589e8b3f7fbfbafa2bf7c3d9ad50b85403 Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Fri, 3 Sep 2021 10:12:50 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/roleManage/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index b8c79cdbc..1c51952da 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -146,7 +146,7 @@
       </div>
     </el-dialog>
     <el-dialog
-      title="系统菜单"
+      title="标准法规树体系"
       :visible.sync="modalflag"
       :wrapperClosable="false"
       @close="closeDialogData"

From 61464742bdc0f670173a6db03d6278df89a1f7d6 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Fri, 3 Sep 2021 10:33:45 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D~?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standardWarning.vue | 208 ++++++++++++++++++------
 1 file changed, 160 insertions(+), 48 deletions(-)

diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index a290cf84a..8e4f32a12 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -89,14 +89,6 @@
                   </template>
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
-                  <template slot-scope="scope">
-                    <div v-if="scope.row.applyType === 'EKFCA'">FCA</div>
-                    <div v-if="scope.row.applyType === 'EKHEV'">HEV</div>
-                    <div v-if="scope.row.applyType === 'EKEV'">纯电动</div>
-                    <div v-if="scope.row.applyType === 'EKQY'">传统车</div>
-                    <div v-if="scope.row.applyType === 'EKPHEV'">混动</div>
-                    <div v-if="scope.row.applyType === 'DIESEL'">柴油</div>
-                  </template>
                 </el-table-column>
                 <el-table-column label="标准类型" align="center">
                   <template slot-scope="scope">
@@ -105,7 +97,7 @@
                 </el-table-column>
                 <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
                   <template slot-scope="scope">
-                    <a @click="showStandDetails(scope.row)">{{ scope.row.dutyEngineer }}</a>
+                    <div>{{ scope.row.dutyEngineer }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center" v-if="isShowBtn">
@@ -160,14 +152,6 @@
                   </template>
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
-                  <template slot-scope="scope">
-                    <div v-if="scope.row.applyType === 'EKFCA'">FCA</div>
-                    <div v-if="scope.row.applyType === 'EKHEV'">HEV</div>
-                    <div v-if="scope.row.applyType === 'EKEV'">纯电动</div>
-                    <div v-if="scope.row.applyType === 'EKQY'">传统车</div>
-                    <div v-if="scope.row.applyType === 'EKPHEV'">混动</div>
-                    <div v-if="scope.row.applyType === 'DIESEL'">柴油</div>
-                  </template>
                 </el-table-column>
                 <el-table-column label="标准类型" align="center">
                   <template slot-scope="scope">
@@ -176,7 +160,7 @@
                 </el-table-column>
                 <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
                   <template slot-scope="scope">
-                    <a @click="showStandDetails(scope.row)">{{ scope.row.dutyEngineer }}</a>
+                    <div>{{ scope.row.dutyEngineer }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center" v-if="isShowBtn">
@@ -216,14 +200,14 @@
                     <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="itemsId" label="条款号" align="center">
+                <el-table-column prop="itemsNum" label="条款号" align="center">
                   <template slot-scope="scope">
-                    <a @click="showStandDetails(scope.row)">{{ scope.row.itemsId }}</a>
+                    <div>{{ scope.row.itemsNum }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="itemsName" label="条款要求" align="center">
                   <template slot-scope="scope">
-                    <a @click="showStandDetails(scope.row)">{{ scope.row.itemsName }}</a>
+                    <div>{{ scope.row.itemsName }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="putTime" label="实施日期" align="center" sortable>
@@ -232,14 +216,6 @@
                   </template>
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
-                  <template slot-scope="scope">
-                    <div v-if="scope.row.applyType === 'EKFCA'">FCA</div>
-                    <div v-if="scope.row.applyType === 'EKHEV'">HEV</div>
-                    <div v-if="scope.row.applyType === 'EKEV'">纯电动</div>
-                    <div v-if="scope.row.applyType === 'EKQY'">传统车</div>
-                    <div v-if="scope.row.applyType === 'EKPHEV'">混动</div>
-                    <div v-if="scope.row.applyType === 'DIESEL'">柴油</div>
-                  </template>
                 </el-table-column>
                 <el-table-column prop="mark" label="标准分类" align="center">
                   <template slot-scope="scope">
@@ -249,7 +225,7 @@
                 </el-table-column>
                 <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
                   <template slot-scope="scope">
-                    <a @click="showStandDetails(scope.row)">{{ scope.row.dutyEngineer }}</a>
+                    <div>{{ scope.row.dutyEngineer }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center" v-if="isShowBtn">
@@ -289,14 +265,14 @@
                     <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="itemsId" label="条款号" align="center">
+                <el-table-column prop="itemsNum" label="条款号" align="center">
                   <template slot-scope="scope">
-                    <a @click="showStandDetails(scope.row)">{{ scope.row.itemsId }}</a>
+                    <div>{{ scope.row.itemsNum }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="itemsName" label="条款要求" align="center">
                   <template slot-scope="scope">
-                    <a @click="showStandDetails(scope.row)">{{ scope.row.itemsName }}</a>
+                    <div>{{ scope.row.itemsName }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="putTime" label="实施日期" align="center" sortable>
@@ -305,14 +281,6 @@
                   </template>
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
-                  <template slot-scope="scope">
-                    <div v-if="scope.row.applyType === 'EKFCA'">FCA</div>
-                    <div v-if="scope.row.applyType === 'EKHEV'">HEV</div>
-                    <div v-if="scope.row.applyType === 'EKEV'">纯电动</div>
-                    <div v-if="scope.row.applyType === 'EKQY'">传统车</div>
-                    <div v-if="scope.row.applyType === 'EKPHEV'">混动</div>
-                    <div v-if="scope.row.applyType === 'DIESEL'">柴油</div>
-                  </template>
                 </el-table-column>
                 <el-table-column prop="mark" label="标准分类" align="center">
                   <template slot-scope="scope">
@@ -322,7 +290,7 @@
                 </el-table-column>
                 <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
                   <template slot-scope="scope">
-                    <a @click="showStandDetails(scope.row)">{{ scope.row.dutyEngineer }}</a>
+                    <div>{{ scope.row.dutyEngineer }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center" v-if="isShowBtn">
@@ -472,6 +440,8 @@ export default {
         applyType: "",
       },
       height: null,
+      energyKindOptions: [], //存放适用车型数据
+      zrgcs: [], //责任工程师
       // 新车型实施日期预警
       newItems: [],
       //政策新车型实施日期预警
@@ -527,11 +497,63 @@ export default {
       }, {
         _this: this
       }, res => {
-        console.log(res.data);
         const result = res.data[0]
         for (const field in result) {
           this[field] = result[field].records
-          this.newItems = result.newItems.records
+          this[field].forEach(item => {
+            // 适用车型转换
+            if (item.applyType !== null) {
+              let k = (item.applyType || "").split(",");
+              for (let i in this.energyKindOptions) {
+                for (let m = 0; m < k.length; m++) {
+                  if (this.energyKindOptions[i].value === k[m]) {
+                    k[m] = this.energyKindOptions[i].label;
+                  }
+                  item.applyType = k.join(",");
+                }
+              }
+            }
+            // 责任工程师转换
+            if (item.dutyEngineer !== null) {
+              let k = (item.dutyEngineer || "").split(",");
+              for (let i in this.zrgcs) {
+                for (let m = 0; m < k.length; m++) {
+                  if (this.zrgcs[i].value === k[m]) {
+                    k[m] = this.zrgcs[i].label;
+                  }
+                  item.dutyEngineer = k.join(",");
+                }
+              }
+            }
+          })
+        let arr  = result.newItems.records
+          arr.forEach(item => {
+            // 适用车型转换
+            if (item.applyType !== null) {
+              let k = (item.applyType || "").split(",");
+              for (let i in this.energyKindOptions) {
+                for (let m = 0; m < k.length; m++) {
+                  if (this.energyKindOptions[i].value === k[m]) {
+                    k[m] = this.energyKindOptions[i].label;
+                  }
+                  item.applyType = k.join(",");
+                }
+              }
+            }
+            // 责任工程师转换
+            if (item.dutyEngineer !== null) {
+              let k = (item.dutyEngineer || "").split(",");
+              for (let i in this.zrgcs) {
+                for (let m = 0; m < k.length; m++) {
+                  if (this.zrgcs[i].value === k[m]) {
+                    k[m] = this.zrgcs[i].label;
+                  }
+                  item.dutyEngineer = k.join(",");
+                }
+              }
+            }
+          })
+          this.newItems = arr
           //可能还需要调整一下条款或标准的顺序（zyh）
           switch (field) {
             case 'newItems':
@@ -635,7 +657,6 @@ export default {
         this.newPolicyPage = 1
         this.oldPolicypage = 1
       }, e => {
-        console.log(e)
       })
     },
     clearBtnClick() {
@@ -653,7 +674,6 @@ export default {
     },
     //取消预警
     cancelWarning(index, row) {
-      console.log(index, row)
       this.$confirm('确认取消预警？', '提示', {
         confirmButtonText: '确定',
         confirmButtonClass: 'common-button-primary',
@@ -661,7 +681,6 @@ export default {
         type: 'warning',
         roundButton: false
       }).then(() => {
-        console.log(569)
         this.$http.get('sys/EarlyWarning/ChangePermissions', {
             id: row.id,
           }, {}, res => {
@@ -679,7 +698,6 @@ export default {
       })
     },
     showStandDetails(item) {
-      console.log(item)
       let getStandId = item.sarId;
       let getStandType = item.sortName;
       // this.$http.get("lawss/sarMenu/judgeSarMenuByRole", {
@@ -805,6 +823,100 @@ export default {
     window.onresize = () => {
       this.height = $(".content").height() * 0.4;
     };
+    //从数据库中查询下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+      _this: this
+    }, res => {
+      this.energyKindOptions = res.data.ENERGYTYPES; // 文本状态
+      this.zrgcs = res.data.ZRGCSCLASS;
+      this.loading[this.field] = true
+      this.$http.get('sys/EarlyWarning/StandWarning', {
+        applyType: '',
+        ...this.pageConfig
+      }, {
+        _this: this
+      }, res => {
+        const result = res.data[0]
+        for (const field in result) {
+          this[field] = result[field].records
+          this[field].forEach(item => {
+            // 适用车型转换
+            if (item.applyType !== null) {
+              let k = (item.applyType || "").split(",");
+              for (let i in this.energyKindOptions) {
+                for (let m = 0; m < k.length; m++) {
+                  if (this.energyKindOptions[i].value === k[m]) {
+                    k[m] = this.energyKindOptions[i].label;
+                  }
+                  item.applyType = k.join(",");
+                }
+              }
+            }
+            // 责任工程师转换
+            if (item.dutyEngineer !== null) {
+              let k = (item.dutyEngineer || "").split(",");
+              for (let i in this.zrgcs) {
+                for (let m = 0; m < k.length; m++) {
+                  if (this.zrgcs[i].value === k[m]) {
+                    k[m] = this.zrgcs[i].label;
+                  }
+                  item.dutyEngineer = k.join(",");
+                }
+              }
+            }
+          })
+          let arr  = result.newItems.records
+          arr.forEach(item => {
+            console.log(item.applyType)
+            // 适用车型转换
+            if (item.applyType !== null) {
+              let k = (item.applyType || "").split(",");
+              for (let i in this.energyKindOptions) {
+                for (let m = 0; m < k.length; m++) {
+                  if (this.energyKindOptions[i].value === k[m]) {
+                    k[m] = this.energyKindOptions[i].label;
+                  }
+                  item.applyType = k.join(",");
+                }
+              }
+            }
+            // 责任工程师转换
+            if (item.dutyEngineer !== null) {
+              let k = (item.dutyEngineer || "").split(",");
+              for (let i in this.zrgcs) {
+                for (let m = 0; m < k.length; m++) {
+                  if (this.zrgcs[i].value === k[m]) {
+                    k[m] = this.zrgcs[i].label;
+                  }
+                  item.dutyEngineer = k.join(",");
+                }
+              }
+            }
+          })
+          this.newItems = arr
+          //可能还需要调整一下条款或标准的顺序（zyh）
+          switch (field) {
+            case 'newItems':
+              this.pageConfig.count1 = result.newItems.total
+              break
+            case 'oldItems':
+              this.pageConfig.count2 = result.oldItems.total
+              break
+            case 'newStand':
+              this.pageConfig.count3 = result.newStand.total
+              break
+            case 'oldStand':
+              this.pageConfig.count4 = result.oldStand.total
+              break
+          }
+        }
+        for (const loading in this.loading) {
+          this.loading[loading] = false
+        }
+      }, e => {
+      });
+
+    });
     // this.queryNewTypeByPage();
     // this.queryProductionVehicleByPage();
     // 四个预警同时查询,loading全部打开

From c0cdb86200ce017b5ef2eccfe98852b8ad24a535 Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Fri, 3 Sep 2021 10:39:48 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/roleManage/index.vue | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index 1c51952da..98d193cec 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -188,13 +188,14 @@
           :model="addForm"
           :rules="addFormRules"
           class="label-input-form"
+
         >
-          <el-form-item label="角色名称" prop="name" label-width="80px" class="add-form-item">
+          <el-form-item label="角色名称" prop="name" label-width="100px" class="add-form-item">
             <el-input v-model="addForm.name"
                       placeholder="请输入角色名称"
                       clearable></el-input>
           </el-form-item>
-          <el-form-item label="上级角色" prop="parentId" label-width="80px" class="add-form-item">
+          <el-form-item label="上级角色" prop="parentId" label-width="100px" class="add-form-item">
             <el-input v-model="addForm.parentId" style="display: none;"
                       clearable></el-input>
             <el-input v-model="addForm.parent"
@@ -202,12 +203,12 @@
                       @click.native="SuperiorRole"
                       clearable></el-input>
           </el-form-item>
-          <el-form-item label="角色描述" prop="remarks" label-width="80px" class="add-form-item">
+          <el-form-item label="角色描述" prop="remarks" label-width="100px" class="add-form-item">
             <el-input v-model="addForm.remarks"
                       placeholder="请输入角色描述"
                       clearable></el-input>
           </el-form-item>
-          <el-form-item label="角色状态" prop="useFlag" label-width="80px" class="add-form-item">
+          <el-form-item label="角色状态" prop="useFlag" label-width="100px" class="add-form-item">
             <el-select class="bead-input" v-model="addForm.useFlag">
               <el-option
                 v-for="item in options"
@@ -646,6 +647,9 @@ export default {
       width: calc(~'100% - 15px') !important;
     }
 
+      /deep/.el-form-item__content {
+        margin-left: 40px !important;
+      }
     .side-bar-collapse {
       background: #5596CC !important;
       color: #FFF;
@@ -708,6 +712,9 @@ export default {
     height: 500px;
     overflow: auto;
   }
+  /deep/.el-form-item__content {
+    margin-left: 40px!important;
+  }
 }
 
 /deep/ .el-select__tags {

From 99ba4248b1f91a7c888f0a061f45c7688d1b4b3f Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 3 Sep 2021 11:06:05 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E5=8F=AF=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EnterpriseStandardDatabase.vue                    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 3438cea85..a42d1fd4d 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -445,7 +445,6 @@
                                 placeholder="请输入企标编号"
                                 clearable
                                 readonly
-                                disabled
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="标准年份" prop="standYear" label-width="150px" class="add-form-item">

From 658788b0cfab49f88d660db24d19584da43ad976 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 3 Sep 2021 11:08:29 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81=E5=8F=B9=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherBussStandardDetails/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 1eb907311..198c4c3c8 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -38,7 +38,7 @@
               <p>
                 <label style=" margin-right: 139px;"
                         title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
-                >文本状态<i class="el-icon-warning-outline"></i></label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
+                >文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
               </p>
               <p><label style=" margin-right: 157px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
               <p><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>

From dd9ceb0357d0bc8beb50e53e318f22bd8a618d9c Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Fri, 3 Sep 2021 11:22:17 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=BA=93=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EnterpriseStandardDatabase.vue               | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 3438cea85..9abe621ad 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -298,7 +298,6 @@
             show-overflow-tooltip
             prop="standName"
             label="中文名称"
-            width="180px"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -308,7 +307,6 @@
             show-overflow-tooltip
             prop="standEnName"
             label="英文名称"
-            width="180px"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
@@ -353,10 +351,8 @@
                   {{scope.row.standStatusShow}}
                 </span>
               </template>
-
-
           </el-table-column>
-          <el-table-column label="操作" align="center" width="50" fixed="right">
+          <el-table-column label="操作" align="center" width="80">
             <template slot-scope="scope">
               <div @click.stop style="display: inline-block">
                 <el-dropdown trigger="click" @command="handleCommand">

From 877bd29a99da2f1d2420bde1e2139e116ffe2f42 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 3 Sep 2021 13:53:30 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E5=8F=AF=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EnterpriseStandardDatabase.vue                    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index a42d1fd4d..3c58f70a8 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -444,7 +444,6 @@
                                 :maxlength="100"
                                 placeholder="请输入企标编号"
                                 clearable
-                                readonly
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="标准年份" prop="standYear" label-width="150px" class="add-form-item">

From d25118f6aa0f8fd5076b6cca6c82f1f9846682be Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 3 Sep 2021 15:39:42 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E7=A6=81=E6=AD=A2=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomFormComponents/File.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue
index f21179876..7f43379ab 100644
--- a/src/components/CustomFormComponents/File.vue
+++ b/src/components/CustomFormComponents/File.vue
@@ -95,7 +95,7 @@ export default {
     allowType: {
       type: Array,
       default: () => {
-        return ['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.jpg','.JPG','.jpeg','.JPEG', '.PNG', '.png', '.xls','.XLS', '.xlsx','.XLSX']
+        return ['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.xls','.XLS', '.xlsx','.XLSX']
       }
     },
     // 栅格比例

From 493c3f53239f9502bb533c00f4efb0e126244188 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 3 Sep 2021 15:48:46 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=A6=81=E6=AD=A2?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InputForStandardsForEnterprise.vue        | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
index a4993dac7..1cce90a58 100644
--- a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
+++ b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
@@ -35,17 +35,17 @@
       <div class="search-area">
         <div class="left">
           <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowSearch">
-            <el-form-item label="数据来源" class="search-item">
-              <el-select v-model="replaceLawsNumForm.dataSource" filterable>
-                <el-option
-                  v-for="item in dataSourceOptions"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
+<!--            <el-form-item label="数据来源" class="search-item">-->
+<!--              <el-select v-model="replaceLawsNumForm.dataSource" filterable>-->
+<!--                <el-option-->
+<!--                  v-for="item in dataSourceOptions"-->
+<!--                  :key="item.value"-->
+<!--                  :value="item.value"-->
+<!--                  :label="item.label"-->
+<!--                >-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
             <el-form-item label="企标编号/标准名称" class="search-item input-width">
               <el-input
                 v-model="replaceLawsNumForm.numberName"
@@ -125,7 +125,7 @@
         </el-table-column>
         <el-table-column
           prop="standStateShow"
-          label="标准状态"
+          label="文本状态"
           width="130">
         </el-table-column>
       </el-table>

From 93a0ca58c109ccfcf1a65451814c8366823eabfe Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Fri, 3 Sep 2021 16:09:25 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index c1acaa477..6d8ab71ef 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/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'}
         ],