From d7e161a7b51a02001e59ea6ad09e4d7a596a5deb Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 24 Jan 2022 15:53:01 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=86=E9=A1=B5=EF=BC=8C=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/mechanismManage/pages/mechanism.vue | 1 +
 src/pages/processCenter/pages/creatProcess/bzrk/step4.vue  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/pages/config/pages/mechanismManage/pages/mechanism.vue b/src/pages/config/pages/mechanismManage/pages/mechanism.vue
index b4d34386a..ec4d5f16b 100644
--- a/src/pages/config/pages/mechanismManage/pages/mechanism.vue
+++ b/src/pages/config/pages/mechanismManage/pages/mechanism.vue
@@ -392,6 +392,7 @@ export default {
     },
     handleNodeClick(data) {
       this.id = data.id
+      this.page = 1
       this.getData()
     },
     // searchPeople(){
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index f6d87d485..50b17a121 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -117,6 +117,7 @@
                   <el-date-picker
                     v-model="form.issueTime"
                     type="date"
+                    value-format="yyyy-MM-dd"
                     placeholder="请选择标准发布日期">
                   </el-date-picker>
                 </el-form-item>

From 047b7db8006e9f939f4ba08569476da3761426e9 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 24 Jan 2022 16:14:49 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=81=E6=A0=87=E4=BB=A3=E6=9B=BF?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EnterpriseStandardDatabase.vue | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 6e34d4592..815e95efc 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -345,18 +345,13 @@
                 }}</a>
             </template>
           </el-table-column>
-          <!--          <el-table-column-->
-          <!--            show-overflow-tooltip-->
-          <!--            prop="standEnName"-->
-          <!--            label="英文名称"-->
-          <!--            min-width="300"-->
-          <!--          >-->
-          <!--            <template slot-scope="scope">-->
-          <!--              <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>-->
-          <!--              <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>-->
-          <!--              <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
+          <el-table-column
+            show-overflow-tooltip
+            prop="dtqbbhbuss"
+            label="代替企标编号"
+            min-width="300"
+          >
+          </el-table-column>
           <el-table-column
             prop="issueTime"
             label="发布日期"

From b8c15a8555d14eaa939a367ce51ae2a2e5b69cb2 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 24 Jan 2022 16:42:30 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BD=93=E7=B3=BB=E7=B1=BB=E5=88=AB?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step1.vue     | 1 +
 src/pages/processCenter/pages/creatProcess/bzrk/step5.vue     | 4 ++--
 .../foreignStandardsAndRegulations/index.vue                  | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index a07cb7537..d07f72008 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -2152,6 +2152,7 @@ export default {
             }, res => {
               if (res && res.data) {
                 const bringData = res.data
+                bringData.txlb = ''
                 bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
                 bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
                 const json = Object.assign(bringData, bringData.attrInfoCaseMap);
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
index 0b54282f6..036269fef 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -346,7 +346,7 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
+                <!--<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                   <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
                     <el-option
                       v-for="item in txlbOptions"
@@ -356,7 +356,7 @@
                       :label="item.label"
                     ></el-option>
                   </el-select>
-                </el-form-item>
+                </el-form-item>-->
               </el-col>
               <el-col :span="12">
                 <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 0813fef85..93b18b308 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -659,14 +659,14 @@
                                       </el-select>
                                     </el-form-item>-->
                   <!--            体系类别-->
-                  <el-form-item label="体系类别" class="add-form-item form-item-disabled">
+                 <!-- <el-form-item label="体系类别" class="add-form-item form-item-disabled">
                     <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
                                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                       <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
                                  :label="opt.label">{{ opt.label }}
                       </el-option>
                     </el-select>
-                  </el-form-item>
+                  </el-form-item>-->
                   <!--            责任工程师-->
                   <template>
                     <el-form-item

From fa96edf2cf160164df283c4ae76494ead3a7925d Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 24 Jan 2022 18:00:46 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=BD=92=E6=A1=A3=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/bzrk/step2.vue      | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 31130d429..1d960222d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -1225,6 +1225,7 @@ export default {
           if (this.form.zrgcs.length === 0) {
             this.form.zrgcs = ''
           }
+          this.form.menusId = this.form.treeListId
           const json = JSON.stringify(this.form);
           this.$http.post('lawss/activiti/completeTask', {
             taskIds: this.taskIds,
@@ -1260,17 +1261,13 @@ export default {
       processCreateStand(_formData).then(res => {
         if (res.result === '操作成功' || res.data === '入库成功') {
           this.$message.success(res.data)
-          let menuList = {
-            idlist: [this.form.standId],
-            menuIds: this.form.treeListId
-          }
-          this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenuForFlow', menuList, {
+          /*this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenuForFlow', menuList, {
             _this: this,
           }, resMenu => {
             if (resMenu.ok) {
               console.log(resMenu)
             }
-          })
+          })*/
           setTimeout(() => {
             this.$router.push({
               name: 'ProcessCenter'

From f407ef402a0bba21e9ea3cc5645d5782d13aee98 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 24 Jan 2022 18:07:49 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=BD=92=E6=A1=A3=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 1d960222d..f82d5cadf 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -1225,7 +1225,7 @@ export default {
           if (this.form.zrgcs.length === 0) {
             this.form.zrgcs = ''
           }
-          this.form.menusId = this.form.treeListId
+          this.form.menusIds = this.form.treeListId
           const json = JSON.stringify(this.form);
           this.$http.post('lawss/activiti/completeTask', {
             taskIds: this.taskIds,

From 7031e0dc01e35e6621191db61b7183ee1966ef0b Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 24 Jan 2022 18:14:53 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index f82d5cadf..ea1ca6d4a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -1225,7 +1225,7 @@ export default {
           if (this.form.zrgcs.length === 0) {
             this.form.zrgcs = ''
           }
-          this.form.menusIds = this.form.treeListId
+          this.form.menuIds = this.form.treeListId
           const json = JSON.stringify(this.form);
           this.$http.post('lawss/activiti/completeTask', {
             taskIds: this.taskIds,