From ed7a32fa759c3f2dd7bdf6b164bed761825e0127 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 10 Aug 2021 14:54:03 +0800
Subject: [PATCH 1/7] feat: There is no way the

---
 src/pages/searchCenter/pages/advancedSearch.vue | 12 ++++++------
 src/pages/searchCenter/pages/standardSearch.vue |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue
index d3bdaaeb9..c04b3ec0e 100644
--- a/src/pages/searchCenter/pages/advancedSearch.vue
+++ b/src/pages/searchCenter/pages/advancedSearch.vue
@@ -13,7 +13,7 @@
             </h5>
           </div>
           <div v-if="!kindtext" style="position: absolute;right: 110px;display: flex">
-            <el-input v-model="standForm.selectValue" :placeholder="$t('m.standSelect')" @keyup.enter.native="btnSearch"
+            <el-input v-model.trim="standForm.selectValue" :placeholder="$t('m.standSelect')" @keyup.enter.native="btnSearch"
                       clearable>
             </el-input>
             <el-button type="primary" @click="btnSearch" style="width: 98px;background:#3391CE
@@ -899,8 +899,8 @@
                   v-if="selectIndex !== 'items'"
                   width="130">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.issue_time !== null && scope.row.issue_time !== undefined">
-                      {{ $dateFormat(new Date(scope.row.issue_time), "yyyy-MM-dd") }}
+                    <div v-if="scope.row.issue_time !== null && scope.row.issueTime !== undefined">
+                      {{ $dateFormat(new Date(scope.row.issueTime), "yyyy-MM-dd") }}
                     </div>
                     <div v-else></div>
                   </template>
@@ -910,8 +910,8 @@
                   :label="$t('m.putTime')"
                   width="130">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.put_time !== null && scope.row.put_time !== undefined">
-                      {{ $dateFormat(new Date(scope.row.put_time), "yyyy-MM-dd") }}
+                    <div v-if="scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== ''">
+                      {{ $dateFormat(new Date(scope.row.SSRQ), "yyyy-MM-dd") }}
                     </div>
                     <div v-else></div>
                   </template>
@@ -919,7 +919,7 @@
                 <el-table-column
                   align="center"
                   width="180"
-                  :label="selectIndex === 'INLAND_STAND' ? '标准状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '企业标准状态')">
+                  :label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '企业标准状态')">
                   <template slot-scope="scope">
                     <div>
                       {{ scope.row.standstateshow }}
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 15040c34f..6ebf1555e 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -11,7 +11,7 @@
                                 <el-input
                                         placeholder="请输入查询条件"
                                         clearable
-                                        v-model="keywords"
+                                        v-model.trim="keywords"
                                         @keyup.enter.native="searchSarByInputKeyByCondition">
                                 </el-input>
                             </div>

From 9f7988254ffe6984131e4374f06b0dcb516811a4 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 10 Aug 2021 15:50:24 +0800
Subject: [PATCH 2/7] commit

---
 .../pages/standInvolveProjectDetail.vue                        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
index 0d07c9321..748e8056b 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
@@ -367,8 +367,7 @@ export default {
         form.current = this.sarProStateTotalPage
         form.size = this.sarProStatePageSize
         this.$http.get('sarStandardComplianceAssessResult/product', form, {
-          _this: this,
-          loading: 'loading'
+          _this: this
         }, res => {
           if (res.ok) {
             // res.data.records.forEach((item)=>{

From fbac71acd7fa485df5c309e76d287e433e7d1cee Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 10 Aug 2021 15:57:17 +0800
Subject: [PATCH 3/7] feat: There is no way the

---
 .../searchCenter/pages/advancedSearch.vue     | 77 +++++++++++++------
 .../searchCenter/pages/standardSearch.vue     | 40 ++++++++--
 2 files changed, 86 insertions(+), 31 deletions(-)

diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue
index c04b3ec0e..ef7c8d359 100644
--- a/src/pages/searchCenter/pages/advancedSearch.vue
+++ b/src/pages/searchCenter/pages/advancedSearch.vue
@@ -937,7 +937,16 @@
                                     <i class="iconfont">&#xe61e;</i>
                                     <el-dropdown-menu slot="dropdown">
                                         <el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item>
-                                        <el-dropdown-item :command="beforeHandleCommand('a',scope.row)">取消收藏</el-dropdown-item>
+                                        <el-dropdown-item v-if="scope.row.collectBtn"
+                                                          :command="beforeHandleCommand('d',scope.row)"
+                                        >
+                                            收藏
+                                        </el-dropdown-item>
+                                        <el-dropdown-item  v-else
+                                                           :command="beforeHandleCommand('a',scope.row)"
+                                        >
+                                            取消收藏
+                                        </el-dropdown-item>
 <!--                                        <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
                                     </el-dropdown-menu>
                                 </el-dropdown>
@@ -948,8 +957,16 @@
                                     <i class="iconfont">&#xe61e;</i>
                                     <el-dropdown-menu slot="dropdown">
                                         <el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item>
-                                        <el-dropdown-item v-btn-permission="'FB3R3TVALD'" :command="beforeHandleCommand('d',scope.row)">收藏</el-dropdown-item>
-<!--                                        <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
+                                        <el-dropdown-item v-if="scope.row.collectBtn"
+                                                          :command="beforeHandleCommand('d',scope.row)"
+                                        >
+                                            收藏
+                                        </el-dropdown-item>
+                                        <el-dropdown-item  v-else
+                                                           :command="beforeHandleCommand('a',scope.row)"
+                                        >
+                                            取消收藏
+                                        </el-dropdown-item><!--                                        <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
                                     </el-dropdown-menu>
                                 </el-dropdown>
 
@@ -960,7 +977,16 @@
                             <el-button size="mini" @click="itemsDetails(scope.row)">查看</el-button>
                         </div>
                         <div v-else>
-                            <el-button size="mini" type="primary" v-if="scope.row.collectId" @click="clickCollection(scope.row)">取消收藏</el-button>
+                            <el-dropdown-item v-if="scope.row.collectBtn"
+                                              :command="beforeHandleCommand('d',scope.row)"
+                            >
+                                收藏
+                            </el-dropdown-item>
+                            <el-dropdown-item  v-else
+                                               :command="beforeHandleCommand('a',scope.row)"
+                            >
+                                取消收藏
+                            </el-dropdown-item>
                             <el-button size="mini" type="primary" v-else @click="clickCollection(scope.row)">收藏</el-button>
 <!--                            <el-button sizi="mini" @click="clickShare(scope.row)">分享</el-button>-->
                         </div>
@@ -1306,9 +1332,7 @@ export default {
                       const inlandList = data['INLAND_STAND'] || []
                       const foreignList = data['FOREIGN_STAND'] || []
                       const foreignFilterList = foreignList.filter ( item => item.attrField === 'GXHBQ' || item.attrField === 'ZBJBD' || item.attrField === 'KWJ' || item.attrField === 'TXLB');
-                      console.log(foreignFilterList)
                       this.formFieldListStandData = this.formFieldListStandData.concat(inlandList).concat(foreignFilterList);
-                      console.log(this.formFieldListStandData,'-----------------------------------1')
                   }
               }, e => {})
       },
@@ -1720,6 +1744,13 @@ export default {
           this.total = res.data.count;
           this.resultData = res.data.list;
           this.resultData.map((item) => {
+              if (item.collectId != null && item.collectId !== '') {
+                  item.collectBtn = false
+                  item.cancelCollectBtn = true
+              } else {
+                  item.collectBtn = true
+                  item.cancelCollectBtn = false
+              }
             if (item.applyArcticShow) {
               item.applyArcticShow.toString();
               item.applyArcticShow = item.applyArcticShow.slice(0, item.applyArcticShow.length - 1);
@@ -1936,13 +1967,13 @@ export default {
       }
       let pagetype = "";
       if (item.type === "stand") {
-        if (item.stand_type === "INLAND") {
+        if (item.standType === "INLAND") {
           pagetype = "INLAND_STAND";
         } else {
           pagetype = "FOREIGN_STAND";
         }
       } else if (item.type === "laws") {
-        if (item.laws_type === "INLAND") {
+        if (item.lawsType === "INLAND") {
           pagetype = "INLAND_LAWS";
         } else {
           pagetype = "FOREIGN_LAWS";
@@ -1959,6 +1990,7 @@ export default {
         }
       }
       personCollect.collectType = pagetype;
+      personCollect.userId = this.$store.getters.userInfo.userId
       this.$http.postData("person/personCollect", personCollect, {
         _this: this
       }, res => {
@@ -1970,21 +2002,20 @@ export default {
     },
     // 取消收藏
     cancelCollectStandard(item) {
-      // this.judgeBussRole(item)
-      // if (this.bussRoleFlag === false) {
-      //   this.$message.error('当前角色无权限操作此数据')
-      // } else {
-      // }
-      this.$http.put("person/personCollect/updateByUserId", {
-        id: item.collectId
-      }, {
-        _this: this
-      }, res => {
-        item.collectBtn = !item.collectBtn;
-        item.cancelCollectBtn = !item.cancelCollectBtn;
-        item.collectId = "";
-      }, e => {
-      });
+        item.isSubmit = true
+        this.$http.put('person/personCollect/updateByUserId', {
+            id: item.collectId
+        }, {
+            _this: this
+        }, res => {
+            item.isSubmit = false
+            item.collectBtn = !item.collectBtn
+            item.cancelCollectBtn = !item.cancelCollectBtn
+            item.collectId = ''
+            this.$message.success(res.message)
+        }, e => {
+            item.isSubmit = false
+        })
     },
     // 取消
     treeCancel() {
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 6ebf1555e..b179d70d1 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -156,8 +156,17 @@
                                                             <!--                          </el-button>-->
                                                             <el-dropdown-menu slot="dropdown">
                                                                 <el-dropdown-item :command="beforeHandleCommand('see',scope.row)">查看</el-dropdown-item>
-                                                                <el-dropdown-item :command="beforeHandleCommand('a',scope.row)">取消收藏</el-dropdown-item>
-<!--                                                                <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
+                                                                <el-dropdown-item v-if="scope.row.collectBtn"
+                                                                                  :command="beforeHandleCommand('d',scope.row)"
+                                                                >
+                                                                    收藏
+                                                                </el-dropdown-item>
+                                                                <el-dropdown-item  v-else
+                                                                                   :command="beforeHandleCommand('a',scope.row)"
+                                                                >
+                                                                    取消收藏
+                                                                </el-dropdown-item>
+                                                                <!--   <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
                                                             </el-dropdown-menu>
                                                         </el-dropdown>
                                                     </div>
@@ -170,8 +179,17 @@
                                                             <!--                          </el-button>-->
                                                             <el-dropdown-menu slot="dropdown">
                                                                 <el-dropdown-item :command="beforeHandleCommand('see',scope.row)">查看</el-dropdown-item>
-                                                                <el-dropdown-item :command="beforeHandleCommand('d',scope.row)">收藏</el-dropdown-item>
-<!--                                                                <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
+                                                                <el-dropdown-item v-if="scope.row.collectBtn"
+                                                                                  :command="beforeHandleCommand('d',scope.row)"
+                                                                >
+                                                                    收藏
+                                                                </el-dropdown-item>
+                                                                <el-dropdown-item  v-else
+                                                                                   :command="beforeHandleCommand('a',scope.row)"
+                                                                >
+                                                                    取消收藏
+                                                                </el-dropdown-item>
+                                                                <!--        <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
                                                             </el-dropdown-menu>
                                                         </el-dropdown>
                                                     </div>
@@ -1003,7 +1021,6 @@
                             })
                         }
                         this.searchOriginOptions = this.searchOptions
-                        console.log(this.searchOriginOptions)
                         this.saveAllSortOptions = res.data.STANDCLASSIFY
                         this.saveAllFineOptions = res.data.BUSSFINECLASSSHOW
                         this.lawssStateOptions = res.data.LAWSSTATE // 文本状态数组
@@ -1241,6 +1258,15 @@
                     if (res.ok) {
                         this.total = res.data.count
                         this.resultData = res.data.list
+                        this.resultData.map((item) => {
+                            if (item.collectId != null && item.collectId !== '') {
+                                item.collectBtn = false
+                                item.cancelCollectBtn = true
+                            } else {
+                                item.collectBtn = true
+                                item.cancelCollectBtn = false
+                            }
+                        });
                         this.selectGroupdata(res.data)
                     } else {
                         this.total = 0
@@ -1877,7 +1903,6 @@
                     let pagetype = ''
                     pagetype = item.typeShow
                     if (item.typeShow === 'INLAND_STAND') {
-                        console.log('guonei权限')
                         routername = 'OtherStandardDetails'
                         // if (this.$hasPermission('CFEZ3VP7EA95CTRBH3JB')) {
                         //   routername = 'OtherStandardDetails'
@@ -2051,6 +2076,7 @@
                     }
                 }
                 personCollect.collectType = pagetype
+                personCollect.userId = this.$store.getters.userInfo.userId
                 this.$http.postData('person/personCollect', personCollect, {
                     _this: this
                 }, res => {
@@ -2120,7 +2146,6 @@
                         type: 'warning'
                     })
                 } else {
-                    console.log(this.selectNowObjResult);
                     let pagetype = ''
                     if (this.selectNowObjResult.type === 'stand') {
                         if (this.selectNowObjResult.standType === 'INLAND') {
@@ -2241,7 +2266,6 @@
                 if (item.type === 'stand') {
                     // if (this.$hasPermission('HK36LHK9444NPN8X634W')){
                     routername = 'OtherStandardDetails'
-                    console.log('guoneiQUANXIAN')
                     if (item.standType === 'INLAND') {
                         pagetype = 'INLAND_STAND'
                     } else {

From 8a2b48b443d4bc47f5d43fc6c3abe560ce7cf850 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 10 Aug 2021 16:02:57 +0800
Subject: [PATCH 4/7] feat: There is no way the

---
 src/pages/searchCenter/pages/advancedSearch.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue
index ef7c8d359..b259f8190 100644
--- a/src/pages/searchCenter/pages/advancedSearch.vue
+++ b/src/pages/searchCenter/pages/advancedSearch.vue
@@ -75,11 +75,11 @@
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
                     <el-form-item label="标准年份" prop="standYear">
-                      <el-date-picker
-                        v-model="standForm.standYear"
-                        type="date"
-                        placeholder="根据标准年份查找">
-                      </el-date-picker>
+                        <el-input
+                                v-model.number="standForm.standYear"
+                                placeholder="请输入标准标准年份"
+                                clearable
+                        ></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">

From bf874f055e7c1e64de73b0287b157cf42de75de5 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 10 Aug 2021 16:29:19 +0800
Subject: [PATCH 5/7] feat: There is no way the

---
 .../searchCenter/pages/advancedSearch.vue     | 48 +++++++++++++------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue
index b259f8190..2acf17183 100644
--- a/src/pages/searchCenter/pages/advancedSearch.vue
+++ b/src/pages/searchCenter/pages/advancedSearch.vue
@@ -53,7 +53,7 @@
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
                     <el-form-item label="标准类别" prop="standSort">
-                      <el-select :popper-append-to-body="false" v-model="standForm.standSort" placeholder="请选择标准类别">
+                      <el-select :popper-append-to-body="false" v-model="standForm.standSort" placeholder="请选择标准类别" clearable>
                         <el-option
                                 v-for="item in standSortOptions"
                                 placeholder="请选择"
@@ -104,7 +104,7 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="标准性质" prop="standNumber">
-                      <el-select :popper-append-to-body="false" v-model="standForm.standNature" placeholder="请选择标准性质">
+                      <el-select :popper-append-to-body="false" v-model="standForm.standNature" placeholder="请选择标准性质" clearable>
                         <el-option
                                 v-for="item in standNatureOptions"
                                 placeholder="请选择"
@@ -119,7 +119,7 @@
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
                     <el-form-item label="文本状态" prop="textStatus">
-                      <el-select :popper-append-to-body="false" v-model="standForm.textStatus" placeholder="请选择文本状态">
+                      <el-select :popper-append-to-body="false" v-model="standForm.textStatus" placeholder="请选择文本状态" clearable>
                         <el-option
                                 v-for="item in standStateOptions"
                                 placeholder="请选择"
@@ -144,7 +144,7 @@
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
                     <el-form-item label="是否纳入标准清单" prop="bringIntoList">
-                        <el-select v-model="standForm.isRelateAccess" class="advanced-one" placeholder="请选择是否纳入标准清单">
+                        <el-select v-model="standForm.isRelateAccess" class="advanced-one" placeholder="请选择是否纳入标准清单" clearable>
                           <el-option value="1" label="是"></el-option>
                           <el-option value="2" label="否"></el-option>
                         </el-select>
@@ -186,14 +186,14 @@
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
                     <el-form-item label="归口管理部门" prop="gkdw">
-                      <el-select :popper-append-to-body="false"  v-model="standForm.gkdw" placeholder="请选择归口管理部门">
+                      <el-select :popper-append-to-body="false"  v-model="standForm.gkdw" placeholder="请选择归口管理部门" clearable>
                         <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
                       </el-select>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="起草单位" prop="qcdw">
-                      <el-select :popper-append-to-body="false" v-model="standForm.qcdw" placeholder="请选择起草单位" multiple>
+                      <el-select :popper-append-to-body="false" v-model="standForm.qcdw" placeholder="请选择起草单位" multiple clearable>
                         <el-option
                                 v-for="item in qcdwOption"
                                 placeholder="请选择"
@@ -208,7 +208,7 @@
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
                     <el-form-item label="我司参与深度" prop="cysd">
-                      <el-select :popper-append-to-body="false" v-model="standForm.cysd" placeholder="请选择我司参与深度">
+                      <el-select :popper-append-to-body="false" v-model="standForm.cysd" placeholder="请选择我司参与深度" clearable>
                         <el-option
                                 v-for="item in cysdOptions"
                                 placeholder="请选择"
@@ -221,7 +221,7 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="适用车型" prop="cllx">
-                      <el-select :popper-append-to-body="false" v-model="standForm.cllx" placeholder="请选择适用车型" multiple>
+                      <el-select :popper-append-to-body="false" v-model="standForm.cllx" placeholder="请选择适用车型" multiple clearable>
                         <el-option
                                 v-for="item in applyArcticOptions"
                                 placeholder="请选择"
@@ -236,7 +236,7 @@
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
                     <el-form-item label="能源类型" prop="nylx">
-                      <el-select :popper-append-to-body="false" v-model="standForm.nylx" placeholder="请选择能源类型" multiple>
+                      <el-select :popper-append-to-body="false" v-model="standForm.nylx" placeholder="请选择能源类型" multiple clearable>
                         <el-option
                                 v-for="item in categoryOptions"
                                 placeholder="请选择"
@@ -249,7 +249,7 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="适用产品线" prop="sycpx">
-                      <el-select :popper-append-to-body="false" v-model="standForm.sycpx" placeholder="请选择适用产品线" multiple>
+                      <el-select :popper-append-to-body="false" v-model="standForm.sycpx" placeholder="请选择适用产品线" multiple clearable>
                         <el-option
                                 v-for="item in sycpxOptions"
                                 placeholder="请选择"
@@ -264,7 +264,7 @@
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
                     <el-form-item label="适用认证" prop="syrz">
-                      <el-select :popper-append-to-body="false" v-model="standForm.syrz" placeholder="请选择适用认证" multiple>
+                      <el-select :popper-append-to-body="false" v-model="standForm.syrz" placeholder="请选择适用认证" multiple clearable>
                         <el-option
                                 v-for="item in applyAuthOptions"
                                 placeholder="请选择"
@@ -277,7 +277,7 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="责任部门" prop="zrbm">
-                      <el-select :popper-append-to-body="false" v-model="standForm.zrbm" placeholder="请选择责任部门" multiple>
+                      <el-select :popper-append-to-body="false" v-model="standForm.zrbm" placeholder="请选择责任部门" multiple clearable>
                         <el-option
                                 v-for="item in zrbmOptions"
                                 placeholder="请选择"
@@ -292,7 +292,7 @@
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
                     <el-form-item label="责任工程师" prop="zrgcs">
-                      <el-select :popper-append-to-body="false" v-model="standForm.zrgcs" placeholder="请选择责任工程师" multiple>
+                      <el-select :popper-append-to-body="false" v-model="standForm.zrgcs" placeholder="请选择责任工程师" multiple clearable>
                         <el-option
                                 v-for="item in zrgcsOptions"
                                 placeholder="请选择"
@@ -380,7 +380,7 @@
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
                     <el-form-item label="采标程度" prop="standNumber">
-                      <el-select :popper-append-to-body="false" v-model="standForm.cbcd" placeholder="请选择采标程度">
+                      <el-select :popper-append-to-body="false" v-model="standForm.cbcd" placeholder="请选择采标程度" clearable>
                         <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                       </el-select>
                     </el-form-item>
@@ -2309,6 +2309,26 @@ export default {
     }
   },
   watch: {
+    "standForm.zccssrq"(newVal) {
+      if (newVal == null) {
+        this.standForm.zccssrq = "";
+      }
+    },
+    "standForm.xcxssrq"(newVal) {
+      if (newVal == null) {
+        this.standForm.xcxssrq = "";
+      }
+    },
+    "standForm.ssrq"(newVal) {
+      if (newVal == null) {
+        this.standForm.ssrq = "";
+      }
+    },
+    "standForm.issueTime"(newVal) {
+      if (newVal == null) {
+        this.standForm.issueTime = "";
+      }
+    },
     // 资源大类监听, 改变后过滤条件
     selectIndex(val) {
       let type = "";

From 9f39c4d29c42230e99590947806a580d94bca3b7 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 10 Aug 2021 17:11:47 +0800
Subject: [PATCH 6/7] feat: There is no way the

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

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 5f38e84b8..10c9a1e9c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -2346,6 +2346,7 @@
                 this.qcdwOption = res.data.QCDW // 体系类别
                 this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
                 this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
+                this.txlbOptions = res.data.TXLBCLASS // 体系类别
                 this.setMap(this.standStateOptions)
             })
             this.busVsFunc()

From 986f1639c9546d26ebc8f7427ded66629e3ea51f Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Tue, 10 Aug 2021 17:21:04 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/wfhxzg/step4.vue            | 14 ++++++--------
 .../pages/creatProcess/wfhxzg/step5.vue            |  4 ++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index 6ef3f73c2..0bce9bc75 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -382,15 +382,13 @@ export default {
     },
     // 移除上传的文件
     handleBeforeRemove(file, fileList) {
-      this.fileListData.fileText = fileList
-      this.fileTextList = fileList
-/*      this.newDataList.forEach((item, index) => {
-        if (file.name === item.name || file.id === item.id) {
-          this.newDataList.splice(index, 1)
-          console.log(this.dataList)
-
+      this.fileData = fileList
+      this.fileTextList.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id ) {
+          console.log()
+          this.fileTextList.splice(index,1)
         }
-      })*/
+      })
     },
     handleONRemove() {},
     /************ ********* *****************/
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
index 865a6a96e..b952313b3 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
@@ -360,8 +360,8 @@ export default {
       this.backLoading = true
       if (this.commentText) {
         var json = {
-          responUserInfo: {
-            info: this.dataList
+          responUserList: {
+            standardInfoList: this.dataList
           },
           actionFlag: 1,
           commentText: this.commentText