From 5ddf90cfe0f56c24e9d9be202430f4d1e3fc11c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 9 Sep 2021 19:30:44 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standardWarning.vue | 116 +++++++++++++-----------
 1 file changed, 64 insertions(+), 52 deletions(-)

diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index fbaf6a859..6a371a151 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -8,59 +8,70 @@
           <!--          <el-tabs v-model="activeName" @tab-click="handleClick">-->
           <!--            <el-tab-pane label="标准预警" name="STANDARD">-->
           <div class="dynamic-content">
-            <el-row>
-              <el-col>
-                <h5>实施预警</h5>
-              </el-col>
-              <el-col>
-                <div class="more">
-                  <el-form :inline="true" :model="dynamic" class="demo-form-inline">
-                    <el-form-item label="标准编号">
-                      <el-input clearable size="small"
-                                v-model="dynamic.standCode"
-                                placeholder="根据标准编号查找">
-                      </el-input>
-                    </el-form-item>
-                    <el-form-item label="标准名称">
-                      <el-input clearable size="small"
-                                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="small"
-                        v-model="dynamic.putTime"
-                        value-format="yyyy-MM-dd"
-                        placeholder="根据实施日期查找">
-                      </el-datePicker>
-                    </el-form-item>
-                    <el-form-item label="适用车型">
-                      <el-input clearable size="small"
-                                v-model="dynamic.applyType"
-                                placeholder="根据适用车型查找">
-                      </el-input>
-                    </el-form-item>
-                    <el-form-item>
-                      <el-button
-                        type="primary"
-                        size="small"
-                        @click="searchBtnClick"
-                        class="common-button-primary">
-                        查询
-                      </el-button>
-                      <el-button
-                        size="small"
-                        @click="clearBtnClick"
-                        class="common-button-primary">
-                        清空
-                      </el-button>
-                    </el-form-item>
-                  </el-form>
+          <div>
+            <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"
+                    @click="searchBtnClick"
+                    class="common-button-primary">
+                    查询
+                  </el-button>
+                  <el-button
+                    size="mini"
+                    @click="clearBtnClick"
+                    class="common-button-primary">
+                    清空
+                  </el-button>
                 </div>
-              </el-col>
-            </el-row>
-            <div class="content" style="height: 100%; padding-top: 5px; ">
+<!--                <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; ">
               <el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
               <el-table
                 :data="newItems"
@@ -1087,6 +1098,7 @@ export default {
         }
 
         .more {
+           margin-top: 30px;
           /deep/ .el-input__inner {
             width: 155px;
           }

From a8d22ab4802e878a63f8505f9d0e5ad9c1f58854 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 9 Sep 2021 19:31:57 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86,?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BD=93=E7=B3=BB,=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=BD=93=E7=B3=BB?=
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 95cd76388..cfefa2373 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -2530,8 +2530,8 @@ export default {
       this.selectChildMenu(data)
       this.productModal = true
       // 取消所有的选中效果
+      this.productTitle = '编辑体系'
       this.handleSelectAll(false)
-      this.productTitle = '编辑信息'
       // const newChild = { id: this.id++, label: 'testtest', children: [] };
       // if (!data.children) {
       //     this.$set(data, 'children', []);
@@ -2543,10 +2543,10 @@ export default {
       this.modalType = 1
       this.selectChildMenu(data)
       this.productModal = true
+      this.productTitle = '新增体系'
+      this.productModelAdd.dicTypeCode = ''
       // 取消所有的选中效果
       this.handleSelectAll(false)
-      this.productTitle = '新增下级菜单信息'
-      this.productModelAdd.dicTypeCode = ''
       // const newChild = { id: this.id++, label: 'testtest', children: [] };
       // if (!data.children) {
       //     this.$set(data, 'children', []);

From 00dd9ffd153b5dd14ba7bb0c2e172e72b24a52e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 9 Sep 2021 19:36:38 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/processList/tabComponents/taskDraft/index.vue       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 09410d64a..1673f66fb 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -80,7 +80,6 @@
                   prop="prcType"
                   label="流程类型"
                   align="center"
-                  width="500"
           >
             <template slot-scope="scope">
               {{ scope.row.prcName || getPrcName(scope.row.prcType) }}
@@ -98,14 +97,12 @@
                   prop="creatUserName"
                   label="发起人"
                   align="center"
-                  width="300"
           >
           </el-table-column>
           <el-table-column
                   prop="creatTime"
                   label="创建日期"
                   align="center"
-                  width="380"
           >
             <template slot-scope="scope">
               <span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -115,7 +112,6 @@
                   prop="overTime"
                   label="完成日期"
                   align="center"
-                  width="380"
           >
             <template slot-scope="scope">
               <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>

From c64de31cdb08af3f81f156fe086619258ceef4fe Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Thu, 9 Sep 2021 20:28:39 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E6=95=B4=E6=94=B9=E5=BA=93=E5=88=86=E9=A1=B5bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 35a773a73..271ca692a 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -836,7 +836,7 @@
           <label class="see-drawer-name" title="新车型实施日期">新车型实施日期</label>
           <span class="see-drawer-val"
                 :title="standShowItemEO.xcxssrq">{{
-              standShowItemEO.xcxssrq ? $moment(standShowItemEO.xccssrq).format('YYYY-MM-DD') : ''
+              standShowItemEO.xccssrq ? $moment(standShowItemEO.xccssrq).format('YYYY-MM-DD') : ''
             }}</span>
         </div>
         <div class="see-drawer-div">

From 6b8ae349e72380fb07ed6a394a613fe528a901ea 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, 10 Sep 2021 11:06:19 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standardForComments/index.vue             | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue
index 59d4a3b3b..6a0ece6d2 100644
--- a/src/pages/regulatoryRepository/standardForComments/index.vue
+++ b/src/pages/regulatoryRepository/standardForComments/index.vue
@@ -16,14 +16,24 @@
               <el-input v-model="standCommonlySearch.cname" class="s-c-input" placeholder="请输入关键字" clearable
                         :maxlength="100"></el-input>
             </el-formItem>
-            <el-formItem label="开始日期" class="search-item">
-              <el-datePicker v-model="standCommonlySearch.start" :editable="false"
-                             placeholder="请选择开始日期"></el-datePicker>
-            </el-formItem>
-            <el-formItem label="结束日期" class="search-item">
-              <el-datePicker v-model="standCommonlySearch.end" :editable="false"
-                             placeholder="请选择结束日期"></el-datePicker>
-            </el-formItem>
+            <el-form-item label="开始日期" >
+              <el-date-picker
+                v-model="standCommonlySearch.start"
+                type="date"
+                placeholder="请选择开始日期"
+                size="small"
+                value-format="yyyy-MM-dd">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="结束日期" >
+              <el-date-picker
+                v-model="standCommonlySearch.end"
+                type="date"
+                placeholder="请选择结束日期"
+                size="small"
+                value-format="yyyy-MM-dd">
+              </el-date-picker>
+            </el-form-item>
             <el-formItem class="search-item btn-box">
               <el-button
                 type="primary"
@@ -98,6 +108,8 @@ export default {
   components: {},
   data() {
     return {
+      //格式化成'yy-mm-dd hh:mm:ss'的时间格式
+      formatedTime:'',
       standCommonlySearch: {
         categorg: "",
         cname: "",
@@ -139,18 +151,11 @@ export default {
       this.splitInfoPage = 1;
       this.sarStandCompareHis();
     },
-//     getTime(time){
-//       let date = new Date(time + 8 * 3600 * 1000); // 增加8小时
-//       console.log(date.toJSON().substr(0, 19).replace('T', ' '));
-//       return  date.toJSON().substr(0, 19).replace('T', ' ');
-//     },
     // 查询表格
     sarStandCompareHis() {
       this.spinShow = true;
-      this.standCommonlySearch.start = new Date(this.standCommonlySearch.start).getTime() //转换为毫秒时间戳
       this.standCommonlySearch.type = 1;
       var form = this.standCommonlySearch;
-      console.log(form);
       this.$http.get("slrs/sar-public-idea/SelectAllPage", form, {
         _this: this
       }, res => {

From 5238674ad4019412bb69e8de91674837306798f3 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Fri, 10 Sep 2021 11:10:49 +0800
Subject: [PATCH 6/7] commit

---
 src/pages/regulatoryRepository/standardForComments/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue
index 6a0ece6d2..66500fdb5 100644
--- a/src/pages/regulatoryRepository/standardForComments/index.vue
+++ b/src/pages/regulatoryRepository/standardForComments/index.vue
@@ -20,6 +20,7 @@
               <el-date-picker
                 v-model="standCommonlySearch.start"
                 type="date"
+                :editable="false"
                 placeholder="请选择开始日期"
                 size="small"
                 value-format="yyyy-MM-dd">
@@ -29,6 +30,7 @@
               <el-date-picker
                 v-model="standCommonlySearch.end"
                 type="date"
+                :editable="false"
                 placeholder="请选择结束日期"
                 size="small"
                 value-format="yyyy-MM-dd">
@@ -108,8 +110,6 @@ export default {
   components: {},
   data() {
     return {
-      //格式化成'yy-mm-dd hh:mm:ss'的时间格式
-      formatedTime:'',
       standCommonlySearch: {
         categorg: "",
         cname: "",

From b2a359b2ba42a74a61fc560a4a208c2dec022049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 13 Sep 2021 10:36:04 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1-1.vue     | 14 ++++---------
 .../pages/creatProcess/bzqdfb/step1.vue       | 20 +++++++------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
index 8f68ca173..6937d3afb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
@@ -231,7 +231,7 @@
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
                     <el-input v-model="roleForm.ministerUserName" placeholder="选择标准/政策法规工程师"
-                              @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
+                              disabled></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -788,10 +788,10 @@ export default {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
         dockUser: "",
-        ministerUser: "",
+        ministerUser: this.$store.getters.userInfo.userId,
         directorUser: "",
         dockUserName: "",
-        ministerUserName: "",
+        ministerUserName: this.$store.getters.userInfo.userName,
         directorUserName: ""
       },
       formRules: {
@@ -806,9 +806,6 @@ export default {
         dockUserName: [
           { required: true, message: "请选择会签责任人", trigger: "change" }
         ],
-        ministerUserName: [
-          { required: true, message: "请选择修订责任人", trigger: "change" }
-        ],
         directorUserName: [
           { required: true, message: "请选择审批责任人", trigger: "change" }
         ]
@@ -898,10 +895,7 @@ export default {
       if (this.type === "dockUser") {
         this.roleForm.dockUser = this.roleRow.id;
         this.roleForm.dockUserName = this.roleRow.name;
-      } else if (this.type === "ministerUser") {
-        this.roleForm.ministerUser = data[0].id;
-        this.roleForm.ministerUserName = data[0].name;
-      } else if (this.type === "directorUser") {
+      }  else if (this.type === "directorUser") {
         this.roleForm.directorUser = data[0].id;
         this.roleForm.directorUserName = data[0].name;
       }
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index f8f02eaf0..b961e76cb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -131,20 +131,20 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="XCXSSRQ"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="zccssrqgj"
+            prop="ZCCSSRQ"
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -231,7 +231,7 @@
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
                     <el-input v-model="roleForm.ministerUserName" placeholder="选择标准/政策法规工程师"
-                              @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
+                              disabled></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -758,10 +758,10 @@ export default {
         prcCreateUserName: this.$store.getters.userInfo.userName,
         prcCreateUser: this.$store.getters.userInfo.userId,
         dockUser: "",
-        ministerUser: "",
+        ministerUser: this.$store.getters.userInfo.userId,
         directorUser: "",
         dockUserName: "",
-        ministerUserName: "",
+        ministerUserName: this.$store.getters.userInfo.userName,
         directorUserName: ""
       },
       formRules: {
@@ -776,9 +776,6 @@ export default {
         dockUserName: [
           {required: true, message: "请选择会签责任人", trigger: "change"}
         ],
-        ministerUserName: [
-          {required: true, message: "请选择修订责任人", trigger: "change"}
-        ],
         directorUserName: [
           {required: true, message: "请选择审批责任人", trigger: "change"}
         ]
@@ -857,9 +854,6 @@ export default {
       if (this.type === "dockUser") {
         this.roleForm.dockUser = this.roleRow.id;
         this.roleForm.dockUserName = this.roleRow.name;
-      } else if (this.type === "ministerUser") {
-        this.roleForm.ministerUser = data[0].id;
-        this.roleForm.ministerUserName = data[0].name;
       } else if (this.type === "directorUser") {
         this.roleForm.directorUser = data[0].id;
         this.roleForm.directorUserName = data[0].name;