From bfb46f056ef180348d04f3add2142e7bf9472cfb Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Fri, 19 Nov 2021 15:03:26 +0800
Subject: [PATCH 01/24] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=B7=B3=E5=9B=9E=E9=87=8D=E7=82=B9=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/regulatoryRepository/nonConfomity/index.vue    | 9 +++++++++
 .../nonConfomity/pages/businessDetails.vue               | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue
index 725176438..c4f363993 100644
--- a/src/pages/regulatoryRepository/nonConfomity/index.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/index.vue
@@ -29,8 +29,17 @@ export default {
   },
   methods: {
     handleClick(tab, event) {
+    },
+    getActiveName(){
+      if (this.$route.query.activeName){
+        this.activeName = this.$route.query.activeName
+      }
+      console.log('35',this.activeName)
     }
   },
+  created() {
+    this.getActiveName()
+  },
   watch: {},
   mounted () {}
 }
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue b/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue
index 0733eb5ad..02284699d 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue
@@ -373,7 +373,10 @@ export default {
     },
     back() {
       this.$router.push({
-        name: 'NonConfomity'
+        name: 'NonConfomity',
+        query:{
+          activeName:'keynote'
+        }
       })
     },
 // 清空 查询条件

From 4deaf1964af0363702208b544e06a01754f1b84a Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Fri, 19 Nov 2021 15:34:50 +0800
Subject: [PATCH 02/24] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=A7=84=E5=88=92?=
 =?UTF-8?q?=E9=83=A8=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E8=B7=B3=E5=9B=9E=E9=87=8D=E7=82=B9=E9=97=AE=E9=A2=98=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/regulatoryRepository/nonConfomity/index.vue  | 10 +++++++---
 .../nonConfomity/pages/keyIssues.vue                   |  3 ++-
 .../nonConfomity/pages/productDetails.vue              |  6 +++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue
index c4f363993..2fbd07e11 100644
--- a/src/pages/regulatoryRepository/nonConfomity/index.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/index.vue
@@ -7,7 +7,7 @@
            <rectification-database></rectification-database>
          </el-tab-pane>
          <el-tab-pane label="重点问题项管控" name="keynote">
-           <key-issues></key-issues>
+           <key-issues :keynoteActiveName="keynoteActiveName"></key-issues>
          </el-tab-pane>
        </el-tabs>
      </div>
@@ -24,7 +24,8 @@ export default {
   },
   data () {
     return {
-      activeName: 'database'
+      activeName: 'database',
+      keynoteActiveName: 'cause'
     }
   },
   methods: {
@@ -34,7 +35,10 @@ export default {
       if (this.$route.query.activeName){
         this.activeName = this.$route.query.activeName
       }
-      console.log('35',this.activeName)
+      if (this.$route.query.keynoteActiveName){
+        this.keynoteActiveName = this.$route.query.keynoteActiveName
+      }
+      console.log('35',this.keynoteActiveName)
     }
   },
   created() {
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue b/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue
index 3df10e284..ea9994723 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue
@@ -2,7 +2,7 @@
 <template>
 <div id="key-issues">
   <div class="non-content">
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs v-model="keynoteActiveName" @tab-click="handleClick">
       <el-tab-pane label="事业部" name="cause">
         <business-division></business-division>
       </el-tab-pane>
@@ -20,6 +20,7 @@ import productDepartment from "@/pages/regulatoryRepository/nonConfomity/pages/p
 
 export default {
   name: "keyIssues",
+  props:['keynoteActiveName'],
  components: {
    businessDivision,
    productDepartment,
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue b/src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue
index a1e12dc22..a82a3b4f0 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue
@@ -556,7 +556,11 @@ export default {
     },
     back () {
       this.$router.push({
-        name: 'NonConfomity'
+        name: 'NonConfomity',
+        query:{
+          activeName:'keynote',
+          keynoteActiveName:'product'
+        }
       })
     },
     // 未符合项table selected事件

From 502546eaed3873fb755507939d6fafde361e98c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 19 Nov 2021 16:28:20 +0800
Subject: [PATCH 03/24] commit

---
 .../pages/creatProcess/xmpg/step1-1.vue       | 50 ++++++++++++++++++-
 .../pages/creatProcess/xmpg/step1.vue         | 50 ++++++++++++++++++-
 2 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
index 3737e165c..5efdc5fb9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
@@ -395,6 +395,41 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="产品线" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.productLine"
+                    placeholder="请输入产品线"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="产品线责任人" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.uname"
+                    placeholder="请输入产品线责任人"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    :loading="searching"
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission=""
+                    @click="getProductData">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission=""
+                    @click="clearProject">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
             <el-table
               :data="productData"
               tooltip-effect="dark"
@@ -490,6 +525,10 @@ export default {
         standType: "",
         standName: ""
       },
+      projectSearch: {
+        productLine: '',
+        uname: '',
+      },
       standardTypeOptions: [
         {
           value: "INLAND",
@@ -933,11 +972,20 @@ export default {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
       this.getProductData();
     },
+    //清空产品线数据
+    clearProject(){
+      this.projectSearch = {
+        productLine: '',
+        uname: '',
+      }
+      this.getProductData()
+    },
     //获取产品线数据
     getProductData() {
       this.$http.get("sarStandProjectLibrary/queryProjectManager", {
         current: this.pageNo,
-        pageSize: this.pageSizeNo
+        PageSize: this.pageSizeNo,
+        ...this.projectSearch
       }, {
         _this: this
       }, res => {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 0c2ac6ad7..300e68496 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -397,6 +397,41 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="产品线" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.productLine"
+                    placeholder="请输入产品线"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="产品线责任人" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.uname"
+                    placeholder="请输入产品线责任人"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    :loading="searching"
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission=""
+                    @click="getProductData">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission=""
+                    @click="clearProject">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
             <el-table
               :data="productData"
               tooltip-effect="dark"
@@ -488,6 +523,10 @@ export default {
       // 查询相关参数
       searching: false,
       fileType: "FBGBJBD",
+      projectSearch: {
+        productLine: '',
+        uname: '',
+      },
       standardSearch: {
         standType: "",
         standName: ""
@@ -930,11 +969,20 @@ export default {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
       this.getProductData();
     },
+    //清空产品线数据
+    clearProject(){
+      this.projectSearch = {
+        productLine: '',
+        uname: '',
+      }
+      this.getProductData()
+    },
     //获取产品线数据
     getProductData() {
       this.$http.get("sarStandProjectLibrary/queryProjectManager", {
         current: this.pageNo,
-        pageSize: this.pageSizeNo
+        PageSize: this.pageSizeNo,
+        ...this.projectSearch
       }, {
         _this: this
       }, res => {

From 1f47637212f8b999baf40749d86dc56810f3f14f Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 19 Nov 2021 17:52:52 +0800
Subject: [PATCH 04/24] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         |  5 +++-
 .../pages/creatProcess/bzrk/step4.vue         | 27 ++++++++++++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 132551c8d..6ba314aa4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1718,9 +1718,10 @@
               this.verifySarStandard = this.$route.query.verifySarStandard
               let mes = JSON.parse(res.mes)
               mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-              this.form = mes.form
               this.roleForm = mes.roleForm
               this.commentText = mes.commentText
+              //表单文件处理
+              this.getFormFieldList(mes.form)
             })
           },
           // 将文本状态的id与name对应
@@ -2597,6 +2598,8 @@
             },
             //保存
             handleSave() {
+              //文件处理
+              this.fileInfoHandle();
               this.form.country=this.countryArr;
               // if(item.country !== undefined && item.country !== null){
               //   this.sarStandardsInfoEO.country = item.country.split(",");
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index af8352887..a50d9304d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -1344,7 +1344,14 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew,saveTaskForPub,queryTaskFirst} from 'api/process'
+import {
+  inboundLiaisonDetail,
+  processCreateStand,
+  changeAssigneeNew,
+  saveTaskForPub,
+  queryTaskFirst,
+  saveTaskFirst
+} from 'api/process'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 
@@ -1591,7 +1598,6 @@ export default {
       prcName : this.$route.query.prcName,
       // 调整处理人抽屉状态
       drawerModal: false,
-      drawerTitle: '',
       nodeList: [],
       selectPeople:'',
     }
@@ -1628,9 +1634,11 @@ export default {
       }).then(res => {
         let mes = JSON.parse(res.mes)
         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-        this.form = mes.form
         this.roleForm = mes.roleForm
         this.commentText = mes.commentText
+        this.taskIds=mes.taskIds
+        //表单文件处理
+        this.getFormFieldList(mes.form)
       })
     },
     choiceZRR1 (type, title, id) {
@@ -2001,7 +2009,7 @@ export default {
             break;
           default : ;
         }
-        console.log("caNmae",this.form.caName);
+        // console.log("caNmae",this.form.caName);
         this.$message({
           showClose: true,
           message: response.message,
@@ -2072,7 +2080,7 @@ export default {
       this.fileMadel = true
 
     },fileChange(fileList){
-      console.log("fileList",fileList);
+      // console.log("fileList",fileList);
     },
     // popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
     //   if(checkedData) {
@@ -2209,6 +2217,7 @@ export default {
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
+          console.log("错误")
         })
       })
     },
@@ -2313,18 +2322,24 @@ export default {
       this.active = name
     },
     handleSave() {
+      //表单文件处理
+      this.fileInfoHandle();
       this.form.country=this.countryArr;
       this.saveLoading = true
       let _formData = new FormData()
       // _formData.append('id', this.bpnId)
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.uName)
+      _formData.append('prcType', '1')
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
         form: this.form,
         roleForm: this.roleForm,
         commentText: this.commentText,
         taskInfo: '申请人修订',
+        taskIds:this.taskIds
       }))
-      saveTaskForPub(_formData).then(res => {
+      saveTaskFirst(_formData).then(res => {
         this.saveLoading = false
         this.$message.success('保存成功')
         // this.bpnId = res.result

From 04e6f05115d2a04572b8a990629e3f245a4444bc Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 21 Nov 2021 09:55:08 +0800
Subject: [PATCH 05/24] =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E7=BB=93=E6=9E=84=E6=A0=91=EF=BC=8C=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8A=98=E5=8F=A0=EF=BC=8C=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=89=93=E5=BC=80=EF=BC=8C=E7=9C=8B=E7=9D=80?=
 =?UTF-8?q?=E4=B9=B1=E3=80=82=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A4=E6=8A=98?=
 =?UTF-8?q?=E5=8F=A0=E7=8A=B6=E6=80=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index d4a277ebb..7ec64a6b1 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1894,7 +1894,7 @@ export default {
       loading: false,
       importLoading: false,
       isCollapse: true,
-      sideClose: false, // 边栏收展状态
+      sideClose: true, // 边栏收展状态
       isAdvancedSearch: false, // 高级检索窗口是否打开
       replaceStandNumModel: false,
       lawsExplainQuoteModel: false,

From bda656c5e46fabedd2876d6b784b246281791950 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 21 Nov 2021 09:55:29 +0800
Subject: [PATCH 06/24] =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E7=BB=93=E6=9E=84=E6=A0=91=EF=BC=8C=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8A=98=E5=8F=A0=EF=BC=8C=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=89=93=E5=BC=80=EF=BC=8C=E7=9C=8B=E7=9D=80?=
 =?UTF-8?q?=E4=B9=B1=E3=80=82=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A4=E6=8A=98?=
 =?UTF-8?q?=E5=8F=A0=E7=8A=B6=E6=80=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 92cf0c4b6..9b4c410c1 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -1751,7 +1751,7 @@ export default {
       // 分页查询过程中用到的对象
       loading: false,
       isCollapse: true,
-      sideClose: false, // 边栏收展状态
+      sideClose: true, // 边栏收展状态
       isAdvancedSearch: false, // 高级检索窗口是否打开
       replaceStandNumModel: false,
       lawsExplainQuoteModel: false,

From 017dca168c6b8126cf765c261bc07cea93d1968c Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 21 Nov 2021 09:55:37 +0800
Subject: [PATCH 07/24] =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E7=BB=93=E6=9E=84=E6=A0=91=EF=BC=8C=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8A=98=E5=8F=A0=EF=BC=8C=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=89=93=E5=BC=80=EF=BC=8C=E7=9C=8B=E7=9D=80?=
 =?UTF-8?q?=E4=B9=B1=E3=80=82=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A4=E6=8A=98?=
 =?UTF-8?q?=E5=8F=A0=E7=8A=B6=E6=80=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regulatoryRepository/foreignRegulationsDatabase/index.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index 3a302225d..dc938191f 100644
--- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
@@ -2129,7 +2129,7 @@
           creationTime: ''
         },
         removeOneId: '',
-        sideClose: false, // 边栏收展状态
+        sideClose: true, // 边栏收展状态
         twoOptions: [],
         threeOptions: [],
         orgData: [],

From 6317a646197f3b753e33383e9866a05d803a6a00 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 21 Nov 2021 09:55:49 +0800
Subject: [PATCH 08/24] =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E7=BB=93=E6=9E=84=E6=A0=91=EF=BC=8C=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8A=98=E5=8F=A0=EF=BC=8C=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=89=93=E5=BC=80=EF=BC=8C=E7=9C=8B=E7=9D=80?=
 =?UTF-8?q?=E4=B9=B1=E3=80=82=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A4=E6=8A=98?=
 =?UTF-8?q?=E5=8F=A0=E7=8A=B6=E6=80=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index bf085dd1c..42053dd5a 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -1961,7 +1961,7 @@ export default {
         creationTime: ''
       },
       removeOneId: '',
-      sideClose: false, // 边栏收展状态
+      sideClose: true, // 边栏收展状态
       twoOptions: [],
       threeOptions: [],
       orgData: [],

From 8f8054552125ed09d1393c86cdefec65342059b6 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 21 Nov 2021 09:55:59 +0800
Subject: [PATCH 09/24] =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E7=BB=93=E6=9E=84=E6=A0=91=EF=BC=8C=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8A=98=E5=8F=A0=EF=BC=8C=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=89=93=E5=BC=80=EF=BC=8C=E7=9C=8B=E7=9D=80?=
 =?UTF-8?q?=E4=B9=B1=E3=80=82=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A4=E6=8A=98?=
 =?UTF-8?q?=E5=8F=A0=E7=8A=B6=E6=80=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index 6f613fbf6..032eb92f6 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -265,7 +265,7 @@ export default {
       total: 0,
       total2: 0,
       pageSize: this.$store.getters.userInfo.configContent,
-      sideClose: false,
+      sideClose: true,
       data: [], // table数据
       treeLoading: false,
       Loading: false,

From b0071ee8c1096097f9b23baa389cfd3f3cbc9c41 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 21 Nov 2021 09:56:09 +0800
Subject: [PATCH 10/24] =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E7=BB=93=E6=9E=84=E6=A0=91=EF=BC=8C=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8A=98=E5=8F=A0=EF=BC=8C=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=89=93=E5=BC=80=EF=BC=8C=E7=9C=8B=E7=9D=80?=
 =?UTF-8?q?=E4=B9=B1=E3=80=82=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A4=E6=8A=98?=
 =?UTF-8?q?=E5=8F=A0=E7=8A=B6=E6=80=81=EF=BC=9B?=
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 35dd4fc35..45f01ce8f 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -313,7 +313,7 @@ export default {
       },
       nodeList2: [],
       modalflag: false,
-      sideClose: false, // 边栏收展状态
+      sideClose: true, // 边栏收展状态
       filterText: '',
       treeData: [],
       defaultProps: {

From 4fc3e5ee4cebb33a496e362541b2990028b03cf8 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sun, 21 Nov 2021 10:04:17 +0800
Subject: [PATCH 11/24] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=B1=BB=E5=88=AB-?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7-=E6=A0=87=E5=87=86=E5=B9=B4?=
 =?UTF-8?q?=E4=BB=BD=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 52 ++++++++++---------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 1d5ebdfb2..2087f7f32 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -29,6 +29,17 @@
                                         <el-radio label="1">海外标准入库</el-radio>
                                     </el-radio-group>
                                 </el-form-item>
+                              <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
+                                <el-select :popper-append-to-body="false" filterable v-model="form.standSort" placeholder="请选择标准类别">
+                                  <el-option
+                                      v-for="item in standSortOptions"
+                                      placeholder="请选择"
+                                      :key="item.value"
+                                      :value="item.value"
+                                      :label="item.label"
+                                  ></el-option>
+                                </el-select>
+                              </el-form-item>
                                 <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.standNumber"
@@ -36,6 +47,13 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                              <el-form-item v-if="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
+                                <el-input
+                                    v-model="form.standYear"
+                                    placeholder="请输入标准标准年份"
+                                    clearable
+                                ></el-input>
+                              </el-form-item>
                                 <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.standName"
@@ -43,19 +61,6 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
-                                    <el-radio-group v-model="form.signFlag">
-                                        <el-radio label="1">是</el-radio>
-                                        <el-radio label="2">否</el-radio>
-                                    </el-radio-group>
-                                </el-form-item>
-                                <el-form-item v-if="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            v-model="form.standYear"
-                                            placeholder="请输入标准标准年份"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
                                 <el-form-item v-if="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
                                     <el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
                                         <el-option
@@ -88,17 +93,16 @@
                                   ></el-option>
                                 </el-select>
                               </el-form-item>
-                                <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
-                                    <el-select :popper-append-to-body="false" filterable v-model="form.standSort" placeholder="请选择标准类别">
-                                        <el-option
-                                                v-for="item in standSortOptions"
-                                                placeholder="请选择"
-                                                :key="item.value"
-                                                :value="item.value"
-                                                :label="item.label"
-                                        ></el-option>
-                                    </el-select>
-                                </el-form-item>
+
+                              <el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
+                                <el-radio-group v-model="form.signFlag">
+                                  <el-radio label="1">是</el-radio>
+                                  <el-radio label="2">否</el-radio>
+                                </el-radio-group>
+                              </el-form-item>
+
+
+
                                 <el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
                                     <el-select :popper-append-to-body="false" v-model="form.standNature" placeholder="请选择标准性质">
                                         <el-option

From 24b370ac0dd6c7595af01f40623b8ce5679c0d44 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 21 Nov 2021 10:09:37 +0800
Subject: [PATCH 12/24] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=EF=BC=9A=E5=8F=B3=E4=B8=8B=E8=A7=92=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=8C=89=E9=92=AE=E6=94=B9=E4=B8=BA=E2=80=9C+?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E2=80=9D=EF=BC=8C"=E5=B8=A6=E5=85=A5"?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA"=E7=A1=AE=E8=AE=A4"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 1d5ebdfb2..e0ca65d3d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1203,7 +1203,7 @@
                 <el-button
                         round
                         class="common-button-primary"
-                        icon="el-icon-check"
+                        icon="el-icon-plus"
                         type="primary"
                         @click="handleProcessStandardNext(1)">新增</el-button>
                 <el-button
@@ -1211,7 +1211,7 @@
                         class="common-button-primary"
                         icon="el-icon-check"
                         type="primary"
-                        @click="handleProcessStandardNext(2)">带入</el-button>
+                        @click="handleProcessStandardNext(2)">确认</el-button>
                 <el-button
                         round
                         class="common-button-default"

From b2fedcfde8ca6ea389da5fdfc992116f4bf54c3e Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 21 Nov 2021 10:24:58 +0800
Subject: [PATCH 13/24] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=EF=BC=9A=E5=88=A0=E6=8E=89=E8=B4=A3=E4=BB=BB?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E3=80=81=E8=B4=A3=E4=BB=BB=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 09a7d31c2..c55eb6c4c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -507,17 +507,17 @@
                     <div class="prc-content-border" v-show="verifySarStandard">
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
-                                    <el-select :popper-append-to-body="false" v-model="form.zrbm" placeholder="请选择责任部门" multiple>
-                                        <el-option
-                                                v-for="item in zrbmOptions"
-                                                placeholder="请选择"
-                                                :key="item.value"
-                                                :value="item.value"
-                                                :label="item.label"
-                                        ></el-option>
-                                    </el-select>
-                                </el-form-item>
+<!--                                <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">-->
+<!--                                    <el-select :popper-append-to-body="false" v-model="form.zrbm" placeholder="请选择责任部门" multiple>-->
+<!--                                        <el-option-->
+<!--                                                v-for="item in zrbmOptions"-->
+<!--                                                placeholder="请选择"-->
+<!--                                                :key="item.value"-->
+<!--                                                :value="item.value"-->
+<!--                                                :label="item.label"-->
+<!--                                        ></el-option>-->
+<!--                                    </el-select>-->
+<!--                                </el-form-item>-->
                                 <el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
                                     <el-select :popper-append-to-body="false" v-model="form.cllx" placeholder="请选择适用车型" multiple>
                                         <el-option
@@ -639,17 +639,17 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
-                                    <el-select :popper-append-to-body="false" v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>
-                                        <el-option
-                                                v-for="item in zrgcsOptions"
-                                                placeholder="请选择"
-                                                :key="item.value"
-                                                :value="item.value"
-                                                :label="item.label"
-                                        ></el-option>
-                                    </el-select>
-                                </el-form-item>
+<!--                                <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">-->
+<!--                                    <el-select :popper-append-to-body="false" v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>-->
+<!--                                        <el-option-->
+<!--                                                v-for="item in zrgcsOptions"-->
+<!--                                                placeholder="请选择"-->
+<!--                                                :key="item.value"-->
+<!--                                                :value="item.value"-->
+<!--                                                :label="item.label"-->
+<!--                                        ></el-option>-->
+<!--                                    </el-select>-->
+<!--                                </el-form-item>-->
                                 <el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.cycvppscn"

From 09a1b668010a16ba1252a20d167e72e383e7ca8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sun, 21 Nov 2021 10:32:01 +0800
Subject: [PATCH 14/24] commit

---
 src/pages/localTool/standardWarning.vue       | 69 +++----------------
 .../pages/creatProcess/xmpg/step1-1.vue       |  2 +-
 .../pages/creatProcess/xmpg/step1-2.vue       |  2 +-
 .../pages/creatProcess/xmpg/step1-7.vue       |  2 +-
 .../pages/creatProcess/xmpg/step1.vue         |  2 +-
 .../pages/creatProcess/xmpg/step2.vue         |  2 +-
 .../pages/creatProcess/xmpg/step3.vue         |  2 +-
 .../pages/creatProcess/xmpg/step4.vue         |  2 +-
 .../pages/creatProcess/xmpg/step5.vue         |  2 +-
 .../pages/creatProcess/xmpg/step6.vue         |  2 +-
 .../pages/creatProcess/xmpg/step7.vue         |  2 +-
 .../processCenter/pages/newProcess/index.vue  |  2 +-
 .../localProductsOrProjectLibrary/index.vue   |  5 --
 13 files changed, 19 insertions(+), 77 deletions(-)

diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index 432deb5e2..074d1edef 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -56,21 +56,6 @@
                     清空
                   </el-button>
                 </div>
-<!--                <el-form-item>-->
-<!--                  <el-button-->
-<!--                    type="primary"-->
-<!--                    size="mini"-->
-<!--                    @click="searchBtnClick"-->
-<!--                    class="common-button-primary">-->
-<!--                    查询-->
-<!--                  </el-button>-->
-<!--                  <el-button-->
-<!--                    size="mini"-->
-<!--                    @click="clearBtnClick"-->
-<!--                    class="common-button-primary">-->
-<!--                    清空-->
-<!--                  </el-button>-->
-<!--                </el-form-item>-->
               </el-form>
             </div>
             <div class="content" style="height: 100%; padding-top: 50px; ">
@@ -97,7 +82,7 @@
                     <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="standName" label="标准名称" align="center">
+                <el-table-column prop="standName" width="320" label="标准名称" align="center">
                   <template slot-scope="scope">
                     <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                   </template>
@@ -109,16 +94,6 @@
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
                 </el-table-column>
-                <el-table-column label="标准类型" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.dutyEngineer }}</div>
-                  </template>
-                </el-table-column>
                 <el-table-column label="操作" align="center" v-if="isShowBtn">
                   <template slot-scope="scope">
                     <el-button
@@ -160,7 +135,7 @@
                     <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="standName" label="标准名称" align="center">
+                <el-table-column prop="standName" width="320" label="标准名称" align="center">
                   <template slot-scope="scope">
                     <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                   </template>
@@ -172,16 +147,6 @@
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
                 </el-table-column>
-                <el-table-column label="标准类型" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.dutyEngineer }}</div>
-                  </template>
-                </el-table-column>
                 <el-table-column label="操作" align="center" v-if="isShowBtn">
                   <template slot-scope="scope">
                     <el-button
@@ -214,7 +179,7 @@
                     <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="standName" label="标准名称" align="center">
+                <el-table-column prop="standName" width="320" label="标准名称" align="center">
                   <template slot-scope="scope">
                     <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                   </template>
@@ -236,17 +201,6 @@
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
                 </el-table-column>
-                <el-table-column prop="mark" label="标准分类" align="center">
-                  <template slot-scope="scope">
-                    <!--                        <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>-->
-                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.dutyEngineer }}</div>
-                  </template>
-                </el-table-column>
                 <el-table-column label="操作" align="center" v-if="isShowBtn">
                   <template slot-scope="scope">
                     <el-button
@@ -279,7 +233,7 @@
                     <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="standName" label="标准名称" align="center">
+                <el-table-column prop="standName" width="320" label="标准名称" align="center">
                   <template slot-scope="scope">
                     <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                   </template>
@@ -301,17 +255,6 @@
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
                 </el-table-column>
-                <el-table-column prop="mark" label="标准分类" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
-                    <!--                        <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>-->
-                  </template>
-                </el-table-column>
-                <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.dutyEngineer }}</div>
-                  </template>
-                </el-table-column>
                 <el-table-column label="操作" align="center" v-if="isShowBtn">
                   <template slot-scope="scope">
                     <el-button
@@ -1207,6 +1150,10 @@ export default {
         .content {
           padding-bottom: 10px;
           height: calc(~'100% - 40px');
+            /deep/.el-button--mini{
+              padding: 5px 7px;
+              font-size: 8px;
+            }
         }
       }
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
index 5efdc5fb9..4f416b2ed 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step1">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">发起流程</template>
     </ProcessHeader>
     <div class="headerTabs">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue
index 604499b42..b981db3b3 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step2">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">业务经理审批流程</template>
     </ProcessHeader>
     <div class="headerTabs">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
index 26f61542d..9b67d29ba 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step7">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">标准法规部领导审批</template>
     </ProcessHeader>
     <div class="headerTabs">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 300e68496..922bed1d3 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step1">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">发起流程</template>
     </ProcessHeader>
     <div class="headerTabs">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index e38bffd5d..0eb45cace 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step2">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">业务经理审批流程</template>
     </ProcessHeader>
     <div class="headerTabs">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 7ca47be1f..371fbd898 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step3">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">分发责任人分发任务</template>
     </ProcessHeader>
     <div class="headerTabs">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 89de0012f..a169c334c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step4">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">落实人填写评估反馈</template>
     </ProcessHeader>
     <div class="headerTabs">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index 533562eef..f67b3aa9e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step5">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">分发责任人审批</template>
     </ProcessHeader>
     <div class="headerTabs">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index faf53a340..7e78f5769 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step6">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">产品线责任人审批</template>
     </ProcessHeader>
     <div class="headerTabs">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
index 3de594499..3cbb6e001 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step7">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">标准法规部领导审批</template>
     </ProcessHeader>
     <div class="headerTabs">
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index fa54152c6..efdfb9cb1 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -75,7 +75,7 @@
                 <img :src="getImg(Math.floor(Math.random() * 6))">
               </div>
               <div class="card-top-right">
-                <div class="card-top-right-text">项目合规评估流程-标准</div>
+                <div class="card-top-right-text">标准合规评估流程</div>
                 <div class="card-top-right-line"></div>
               </div>
             </div>
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 847f3d63c..19a730c07 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -93,11 +93,6 @@
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
              fontWeight: 'normal', height: '48px'}"
         @selection-change="handleSelectionChange">
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center">
-        </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="projectPlatfor"

From d1f57a9b4a636d41b0fe6b8c06ef4bec8e9d86f0 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 21 Nov 2021 10:42:55 +0800
Subject: [PATCH 15/24] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=EF=BC=9A=E6=A0=87=E5=87=86=E7=B1=BB=E5=88=AB?=
 =?UTF-8?q?=E3=80=81=E6=80=A7=E8=B4=A8=E5=88=A0=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index c55eb6c4c..bd1f57b30 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -29,7 +29,7 @@
                                         <el-radio label="1">海外标准入库</el-radio>
                                     </el-radio-group>
                                 </el-form-item>
-                              <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
+                              <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled" v-show="form.standInData === '0'">
                                 <el-select :popper-append-to-body="false" filterable v-model="form.standSort" placeholder="请选择标准类别">
                                   <el-option
                                       v-for="item in standSortOptions"
@@ -103,7 +103,7 @@
 
 
 
-                                <el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
+                                <el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled" v-show="form.standInData === '0'">
                                     <el-select :popper-append-to-body="false" v-model="form.standNature" placeholder="请选择标准性质">
                                         <el-option
                                                 v-for="item in standNatureOptions"

From fbcb858145275b636fc1b7a5f55092cbed96ee5c Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sun, 21 Nov 2021 10:47:23 +0800
Subject: [PATCH 16/24] =?UTF-8?q?//=20=E5=9B=BD=E5=86=85=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=8D=E5=BF=85=E5=A1=AB=20=E5=9B=BD?=
 =?UTF-8?q?=E5=A4=96=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/bzrk/step1.vue    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index bd1f57b30..86e6f60ca 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1489,7 +1489,7 @@
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
                     ],
                   standEnName: [
-                    { required: true, message: '请输入标准英文名称', trigger: 'blur' },
+                    { required: false, message: '请输入标准英文名称', trigger: 'blur' },
                     { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
                   ],
                     standNature: [
@@ -1557,6 +1557,14 @@
                 handler: function(val) {
                     this.verifySarStandard = false
                     this.standardSearchForm.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+
+                  // 国内英文名称不必填 国外必填
+                    if(this.form.standInData === '1'){
+                        this.rules.standEnName[0].required=true;
+                    }else {
+                      this.rules.standEnName[0].required=false;
+                    }
+
                   //切换清空表单
                   this.form= {
                     // 基础信息

From e3782bc0393fc6644ea930445a85debfc52d40ca Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 21 Nov 2021 11:20:23 +0800
Subject: [PATCH 17/24] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E7=9A=84=E7=AA=97=E5=8F=A3=EF=BC=8C=E4=B8=8A?=
 =?UTF-8?q?=E5=8D=8A=E9=83=A8=E5=8C=BA=E5=9F=9F=E7=BC=A9=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 86e6f60ca..0bca83788 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -918,7 +918,7 @@
                     :on-remove="removeOneFile"
                     :show-file-list="true"
             >
-                <div style="padding: 20px 0">
+                <div>
                     <i class="el-icon-upload" style="color: #3399ff"></i>
                     <p>点击或拖拽上传文件</p>
                 </div>
@@ -2783,6 +2783,26 @@
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
     .bzrkStep1 {
+      /deep/ .el-upload-dragger {
+        background-color: #fff;
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        box-sizing: border-box;
+        width: 360px;
+        height: 75px;
+        text-align: center;
+        position: relative;
+        overflow: hidden;
+      }
+      /deep/ .el-dialog__body {
+        padding: 0 20px;
+        color: #606266;
+        font-size: 14px;
+        word-break: break-all;
+      }
+      /deep/ .el-upload-dragger .el-icon-upload {
+        margin: 0;
+      }
         /deep/.el-drawer__container {
             .prc-content-border {
                 border: none;

From c77dcedf7a64370ad948092d2c05ffb9dc5198b8 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 21 Nov 2021 13:50:56 +0800
Subject: [PATCH 18/24] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E7=9A=84=E7=AA=97=E5=8F=A3=EF=BC=8C=E4=B8=8A?=
 =?UTF-8?q?=E5=8D=8A=E9=83=A8=E5=8C=BA=E5=9F=9F=E7=BC=A9=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 0bca83788..098062d74 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -2795,7 +2795,7 @@
         overflow: hidden;
       }
       /deep/ .el-dialog__body {
-        padding: 0 20px;
+        padding: 0 20px 10px;
         color: #606266;
         font-size: 14px;
         word-break: break-all;

From 204f507097c05d3b0e4a0e72abf5b80190679242 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sun, 21 Nov 2021 14:13:21 +0800
Subject: [PATCH 19/24] =?UTF-8?q?a.=20=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?--=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86=EF=BC=9A=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E5=90=8D=E7=A7=B0=E8=BE=93=E5=85=A5=E5=B7=A6=E7=A7=BB?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E5=88=97=EF=BC=8C=E4=B8=8E=E2=80=9C=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=E5=90=8D=E7=A7=B0=E5=9C=A8=E4=B8=80=E5=88=97=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 86e6f60ca..7022ab8c5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -61,17 +61,14 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item v-if="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
-                                    <el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
-                                        <el-option
-                                                v-for="item in standStateOptions"
-                                                placeholder="请选择"
-                                                :key="item.value"
-                                                :value="item.value"
-                                                :label="item.label"
-                                        ></el-option>
-                                    </el-select>
-                                </el-form-item>
+                              <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
+                                <el-input
+                                    v-model="form.standEnName"
+                                    placeholder="请输入标准英文名称"
+                                    clearable
+                                ></el-input>
+                              </el-form-item>
+
                                 <el-form-item v-if="verifySarStandard" label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
                                     <el-date-picker
                                             v-model="form.issueTime"
@@ -114,13 +111,7 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            v-model="form.standEnName"
-                                            placeholder="请输入标准英文名称"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
+
 
                                 <el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">
                                     <el-button
@@ -149,6 +140,17 @@
                                             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
                                             :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
                                 </el-form-item>
+                              <el-form-item v-if="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
+                                <el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
+                                  <el-option
+                                      v-for="item in standStateOptions"
+                                      placeholder="请选择"
+                                      :key="item.value"
+                                      :value="item.value"
+                                      :label="item.label"
+                                  ></el-option>
+                                </el-select>
+                              </el-form-item>
                                 <el-form-item v-if="verifySarStandard && form.standInData === '1'"  label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.gxhbq"

From 86c450ba6c55684bc5fcf684ba36b823e5a4dee0 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 21 Nov 2021 14:34:38 +0800
Subject: [PATCH 20/24] =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=94=BE=E5=A4=A7=E3=80=82=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=88=90=E5=8A=9F=E5=90=8E=EF=BC=8C=E5=BA=94?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=99=84=E4=BB=B6=E5=8F=8A=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=20=E4=B8=94=E8=83=BD=E6=89=93=E5=BC=80=E9=A2=84=E8=A7=88(?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=AE=9E=E7=8E=B0=E4=B8=8D=E4=BA=86=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=AE=9E=E7=8E=B0=E4=BA=86=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 098062d74..b564dc65c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -2800,6 +2800,9 @@
         font-size: 14px;
         word-break: break-all;
       }
+      /deep/ .el-upload-list__item-name {
+        white-space: inherit;
+      }
       /deep/ .el-upload-dragger .el-icon-upload {
         margin: 0;
       }

From d72f7797cf0b9ea604d7da4dc7b8849b22707da4 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sun, 21 Nov 2021 14:36:21 +0800
Subject: [PATCH 21/24] =?UTF-8?q?=E6=B0=B4=E5=8D=B0=EF=BC=9A=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E5=81=8F=E5=A4=A7=EF=BC=8C=E5=88=86=E5=B8=83=E4=B8=8D?=
 =?UTF-8?q?=E5=9D=87=EF=BC=8C=E6=9C=89=E6=97=B6=E5=B7=A6=E8=BE=B9=E6=9C=89?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=B3=E8=BE=B9=E6=B2=A1=E6=9C=89=EF=BC=8C=E6=9C=89?=
 =?UTF-8?q?=E6=97=B6=E5=B7=A6=E5=8F=B3=E5=BE=88=E5=AF=86=EF=BC=8C=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=8B=E6=9C=89=EF=BC=8C=E4=B8=AD=E9=97=B4=E7=A9=BA=EF=BC=9B?=
 =?UTF-8?q?=E5=BA=94=E9=80=82=E5=BD=93=E7=BC=A9=E5=B0=8F=E5=AD=97=E5=B8=96?=
 =?UTF-8?q?=EF=BC=8C=E7=96=8F=E5=AF=86=E6=9C=89=E8=87=B4=EF=BC=8C=E8=A7=82?=
 =?UTF-8?q?=E6=84=9F=E8=88=92=E9=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/pdf/web/viewer.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/static/pdf/web/viewer.js b/public/static/pdf/web/viewer.js
index 250fd0d42..31be3f39b 100644
--- a/public/static/pdf/web/viewer.js
+++ b/public/static/pdf/web/viewer.js
@@ -6649,13 +6649,13 @@ var PDFPageView = function () {
           watermark_txt: msg,
           watermark_x: 50,//水印起始位置x轴坐标
           watermark_y: 0,//水印起始位置Y轴坐标
-          watermark_rows: 10,//水印行数
-          watermark_cols: 3,//水印列数
-          watermark_x_space: 30,//水印x轴间隔
-          watermark_y_space: 100,//水印y轴间隔
+          watermark_rows: 7,//水印行数
+          watermark_cols: 5,//水印列数
+          watermark_x_space: 80,//水印x轴间隔
+          watermark_y_space: 120,//水印y轴间隔
           watermark_color: 'rgba(192, 192, 192)',//水印字体颜色
           watermark_alpha: 0.3,//水印透明度
-          watermark_fontsize: '50px',//水印字体大小
+          watermark_fontsize: '30px',//水印字体大小
           watermark_font: '微软雅黑',//水印字体
           watermark_width: 120,//水印宽度
           watermark_height: 80,//水印长度

From e36cf79e82359f7d714a659609764e252596bc5e Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 21 Nov 2021 14:48:07 +0800
Subject: [PATCH 22/24] =?UTF-8?q?=E4=B8=8A=E9=9D=A2=E6=9C=89=E7=82=B9?=
 =?UTF-8?q?=E6=8C=A4=EF=BC=8C=E5=8D=8F=E8=B0=83=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index c81555022..f7c4e410a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -2791,7 +2791,7 @@
         border-radius: 6px;
         box-sizing: border-box;
         width: 360px;
-        height: 75px;
+        height: 90px;
         text-align: center;
         position: relative;
         overflow: hidden;
@@ -2806,7 +2806,7 @@
         white-space: inherit;
       }
       /deep/ .el-upload-dragger .el-icon-upload {
-        margin: 0;
+        margin: 10px 0 0 0;
       }
         /deep/.el-drawer__container {
             .prc-content-border {

From b1285e5163b25f57ebb31e498bc8eabf452e91b4 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 21 Nov 2021 14:55:29 +0800
Subject: [PATCH 23/24] =?UTF-8?q?=E8=B5=B7=E8=8D=89=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E4=B8=94=E5=A2=9E=E5=8A=A0=E6=A8=A1=E7=B3=8A=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=EF=BC=88=E8=BE=93=E5=85=A5=E9=A6=96=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E8=B7=B3=E5=87=BA=E7=9B=B8=E5=85=B3=E9=80=89=E9=A1=B9=EF=BC=8C?=
 =?UTF-8?q?=E4=BE=9B=E9=80=89=E6=8B=A9=EF=BC=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index f7c4e410a..0cfdaa0bc 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -596,7 +596,7 @@
                                   </el-select>
                                 </el-form-item>
                                 <el-form-item v-show="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                                    <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple filterable>
                                         <el-option
                                                 v-for="item in qcdwOption"
                                                 placeholder="请选择"

From eae8ffeaad746217d3d7a6f6637e60376a55f29e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sun, 21 Nov 2021 15:00:05 +0800
Subject: [PATCH 24/24] commit

---
 src/pages/localTool/standardWarning.vue | 123 +++++++++++++++---------
 1 file changed, 76 insertions(+), 47 deletions(-)

diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index 074d1edef..b55aa66a9 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -12,51 +12,78 @@
             <h5>实施预警</h5>
           </div>
             <div class="more">
-              <el-form :inline="true" :model="dynamic" class="demo-form-inline">
-                <el-form-item label="标准编号">
-                  <el-input clearable size="mini"
-                            v-model="dynamic.standCode"
-                            placeholder="根据标准编号查找">
-                  </el-input>
-                </el-form-item>
-                <el-form-item label="标准名称">
-                  <el-input clearable size="mini"
-                            v-model="dynamic.standName"
-                            placeholder="根据标准名称查找">
-                  </el-input>
-                </el-form-item>
-                <el-form-item label="实施日期" style="margin-right: -40px" class="choose-time-area">
-                  <el-datePicker
-                    clearable size="mini"
-                    v-model="dynamic.putTime"
-                    value-format="yyyy-MM-dd"
-                    placeholder="根据实施日期查找">
-                  </el-datePicker>
-                </el-form-item>
-                <el-form-item label="适用车型">
-                  <el-input clearable size="mini"
-                            v-model="dynamic.applyType"
-                            placeholder="根据适用车型查找">
-                  </el-input>
-                </el-form-item>
-                <div style="margin: 8px 0 0 0; float: right">
-                  <el-button
-                    type="primary"
-                    size="mini"
-                    v-btn-permission="'5dca375c3d8d57c45e4815acf3611b34'"
-                    @click="searchBtnClick"
-                    class="common-button-primary">
-                    查询
-                  </el-button>
-                  <el-button
-                    size="mini"
-                    @click="clearBtnClick"
-                    v-btn-permission="'8258ee44344e92365e7e5bd90f3c8d21'"
-                    class="common-button-primary">
-                    清空
-                  </el-button>
-                </div>
-              </el-form>
+              <el-row :gutter="24">
+                <el-col span="24">
+                  <el-form :inline="true" :model="dynamic" class="demo-form-inline">
+                    <el-form-item label="标准编号">
+                      <el-input clearable size="mini"
+                                v-model="dynamic.standCode"
+                                placeholder="根据标准编号查找">
+                      </el-input>
+                    </el-form-item>
+                    <el-form-item label="标准名称">
+                      <el-input clearable size="mini"
+                                v-model="dynamic.standName"
+                                placeholder="根据标准名称查找">
+                      </el-input>
+                    </el-form-item>
+                    <el-form-item label="实施日期" style="margin-right: 10px" class="choose-time-area">
+                      <el-date-picker
+                        size="mini"
+                        clearable
+                        v-model="dynamic.putTime"
+                        value-format="yyyy-MM-dd"
+                        type="daterange"
+                        range-separator="-"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期">
+                      </el-date-picker>
+                      <!--                  <el-datePicker-->
+                      <!--                    clearable size="mini"-->
+                      <!--                    v-model="dynamic.putTime"-->
+                      <!--                    value-format="yyyy-MM-dd"-->
+                      <!--                    placeholder="根据实施日期查找">-->
+                      <!--                  </el-datePicker>-->
+                    </el-form-item>
+                    <el-form-item label="适用车型">
+                      <el-input clearable size="mini"
+                                v-model="dynamic.applyType"
+                                placeholder="根据适用车型查找">
+                      </el-input>
+                    </el-form-item>
+                    <div style="margin: 8px 0 0 0; float: right">
+                      <el-button
+                        type="primary"
+                        size="mini"
+                        @click="searchBtnClick"
+                        class="common-button-primary">
+                        查询
+                      </el-button>
+                      <el-button
+                        size="mini"
+                        @click="clearBtnClick"
+                        class="common-button-primary">
+                        清空
+                      </el-button>
+                      <!--                  <el-button-->
+                      <!--                    type="primary"-->
+                      <!--                    size="mini"-->
+                      <!--                    v-btn-permission="'5dca375c3d8d57c45e4815acf3611b34'"-->
+                      <!--                    @click="searchBtnClick"-->
+                      <!--                    class="common-button-primary">-->
+                      <!--                    查询-->
+                      <!--                  </el-button>-->
+                      <!--                  <el-button-->
+                      <!--                    size="mini"-->
+                      <!--                    @click="clearBtnClick"-->
+                      <!--                    v-btn-permission="'8258ee44344e92365e7e5bd90f3c8d21'"-->
+                      <!--                    class="common-button-primary">-->
+                      <!--                    清空-->
+                      <!--                  </el-button>-->
+                    </div>
+                  </el-form>
+                </el-col>
+              </el-row>
             </div>
             <div class="content" style="height: 100%; padding-top: 50px; ">
               <el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
@@ -602,7 +629,8 @@ export default {
         //标准名称
         standName: this.dynamic.standName,
         //实施日期
-        putTime: this.dynamic.putTime,
+        putTime: this.dynamic.putTime[0],
+        lastTime: this.dynamic.putTime[1],
         //适用车型
         applyType: this.dynamic.applyType
       }, {
@@ -1043,6 +1071,7 @@ export default {
         }
 
         .more {
+           width: 100%;
            margin-top: 30px;
           /deep/ .el-input__inner {
             width: 155px;
@@ -1050,7 +1079,7 @@ export default {
 
           .choose-time-area {
             /deep/ .el-input__inner {
-              width: 170px;
+              width: 220px;
             }
           }