From fe353fd761075009718afc64ca8c5afff7bd8d6f Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Wed, 22 Jun 2022 18:13:24 +0800
Subject: [PATCH] feat: There is no way the, bug #55745 #55786 #55815

---
 .../pages/creatProcess/qbrk-product/step1.vue | 54 ++++++++--------
 .../creatProcess/qbrk-product/step13.vue      | 19 +++---
 .../pages/creatProcess/qbrk-product/step3.vue | 14 ++---
 .../pages/creatProcess/qbrk-product/step6.vue | 14 ++---
 .../creatProcess/qbrk-product/stepC3.vue      | 14 ++---
 .../creatProcess/qbrk-product/stepC6.vue      | 14 ++---
 .../pages/creatProcess/qbrk/step13.vue        |  3 +-
 .../components/EnterpriseStandardDatabase.vue | 61 +++++++++++++++++++
 8 files changed, 116 insertions(+), 77 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
index 202082132..ba033a478 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
@@ -82,7 +82,7 @@
 <!--                                </el-form-item>-->
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item v-show="form.standStatus === '3'" class="add-form-item form-item-disabled" style="margin-left: -210px">
+                                <el-form-item v-show="form.standStatus === '2' || form.standStatus === '3'" class="add-form-item form-item-disabled" style="margin-left: -210px">
                                     <el-button
                                             type="primary"
                                             :loading="loadSarStandard"
@@ -1175,11 +1175,14 @@
                     page: 1,
                     pageSize: this.$store.getters.userInfo.configContent,
                     total: 0,
-                    standType: 'INLAND',
+                    standType: 'BUSINESS',
                     standSort: '',
                     standName: '',
                     standEnName: '',
-                    standNumber: ''
+                    standNumber: '',
+                    quoteIdList: '',
+                    validFlag: '0',
+                    menuId: 'nomenu',
                 },
                 tableData: {
                     // 标准表格数据
@@ -1551,7 +1554,7 @@
         },
         methods: {
             regDate(data){
-                if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){
+                if(this.form.standCode !== undefined && this.form.standCode !== null && this.form.standCode.indexOf(data) !== -1){
                     data = data + ' X'
                 }
                 return data
@@ -1570,10 +1573,6 @@
                     this.XGDFileList=[];
                     this.$refs['form'].resetFields()
                     this.form.standStatus = '2'
-                    if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
-                        this.$message.warning("请选择一条被代替企标编号")
-                        return
-                    }
                 }else if(this.form.standStatus === '3' ){
                     if(type !== 'dr'){
                         this.FBGBUSSFileList=[];
@@ -1627,7 +1626,7 @@
                         this.isSubmit = true
                         this.saveLoading = true
                     }
-                    this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, {
+                    this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort}, {
                         _this: this
                     }, res => {
                         const obj = res.data
@@ -2062,11 +2061,11 @@
                               this.QTWJBUSSFileList=[]
                               this.GLWJBUSSFileList=[]
                               this.XGDFileList=[]
+                              let standStatus = this.form.standStatus
                               const json = Object.assign(bringData, bringData.attrInfoMap);
                               this.form = JSON.parse(JSON.stringify(json))
                               this.form.prcNum = this.prcNum
                               this.form.prcName = this.prcName
-                              this.form.standStatus = "3"
                               this.form.QCRBUSSID = ''
                               this.form.standNum =''
                               this.form.planId=''
@@ -2089,7 +2088,21 @@
                               this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
                               this.standardDrawer = false
                               this.verifySarStandard = true
-                              this.getStandInfoByReviseStatus('dr')
+                              if(standStatus && standStatus === '2'){
+                                let date = new Date();
+                                let year = date.getFullYear();
+                                this.form.standStatus = "2"
+                                this.form.standNum = this.form.standNumber
+                                this.form.standSn = this.form.standNum
+                                this.form.standNumber = this.form.standNum
+                                this.form.standYear = this.regDate(year)
+                                this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+                                this.getStandInfoByReviseStatus()
+                                }else {
+                                this.form.standStatus = "3"
+                                this.getStandInfoByReviseStatus('dr')
+                              }
+                                console.log(this.form)
                               this.$forceUpdate()
                             }
                             // 遍历对象初始化文件信息
@@ -2208,7 +2221,11 @@
             },
             getDomesticStandardTable () {
                 this.loadSarStandard = true
-                this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.standardSearchForm, {}, res => {
+                console.log(this.standardSearchForm)
+                this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.standardSearchForm, {
+                    _this: this,
+                    loading: 'replaceLoading'
+                }, res => {
                     this.loadSarStandard = false
                     if (res.ok) {
                         this.tableData.standardData = res.data.list
@@ -2514,13 +2531,6 @@
                     this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'BDTQBBHBUSS'){
                     this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(','))
-                    this.form.standNum = this.filterSetData(textArr2.join(','))
-                    if(this.form.BDTQBBHBUSS !== undefined && this.form.BDTQBBHBUSS !== null){
-                        this.form.standSn = this.form.standNum
-                        this.form.standNumber = this.form.standNum
-                        this.form.standYear = this.regDate(year)
-                        this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
-                    }
                 }else {
                     this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }
@@ -2927,12 +2937,8 @@
                 // test
                 this.isSubmit = false
                 this.saveLoading = false
-                if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
-                    this.$message.warning("请选择一条被代替企标编号")
-                    return
-                }
 
-                if((this.form.standStatus === '3') && (this.standardCheckedList === undefined ||this.standardCheckedList.length === 0)) {
+                if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.standardCheckedList === undefined ||this.standardCheckedList.length === 0)) {
                     this.$message.warning("请选择一条企标标准")
                     return
                 }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
index cb96c2e4f..cd5cdad18 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
@@ -2453,6 +2453,7 @@
                                     this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                     this.form.topId = this.pId
                                     this.form.reviseStatus = 'buss2_'+this.form.standStatus
+                                    this.form.textStatusBuss = '6jnqba2mby'
                                     const json = JSON.stringify(this.form);
                                     this.$http.post('lawss/activiti/completeTask', {
                                         taskIds: this.taskIds,
@@ -2606,7 +2607,7 @@
                 }
             },
             regDate(data){
-                if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){
+                if(this.form.standCode !== undefined && this.form.standCode !== null && this.form.standCode.indexOf(data) !== -1){
                     data = data + ' X'
                 }
                 return data
@@ -2617,16 +2618,10 @@
                 if(this.form.standStatus === '2'){
                     this.form.id = ""
                     this.formKey++
-                    if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
-                        this.$message.warning("请选择一条被代替企标编号")
-                        return
-                    }
-                    if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
-                        this.form.standSn = this.form.standNum
-                        this.form.standNumber = this.form.standNum
-                        this.form.standYear = this.regDate(year)
-                        this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
-                    }
+                    this.form.standSn = this.form.standNum
+                    this.form.standNumber = this.form.standNum
+                    this.form.standYear = this.regDate(year)
+                    this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     this.formKey++
                 }else if(this.form.standStatus === '1' ){
                     this.form.id = ""
@@ -2634,7 +2629,7 @@
                         this.isSubmit = true
                         this.saveLoading = true
                     }
-                    this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, {
+                    this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort}, {
                         _this: this
                     }, res => {
                         const obj = res.data
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
index 442b23596..d978da12a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
@@ -1137,16 +1137,10 @@
                 if(this.form.standStatus === '2'){
                     this.form.id = ""
                     this.formKey++
-                    if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
-                        this.$message.warning("请选择一条被代替企标编号")
-                        return
-                    }
-                    if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
-                        this.form.standSn = this.form.standNum
-                        this.form.standNumber = this.form.standNum
-                        this.form.standYear = this.regDate(year)
-                        this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
-                    }
+                    this.form.standSn = this.form.standNum
+                    this.form.standNumber = this.form.standNum
+                    this.form.standYear = this.regDate(year)
+                    this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     this.formKey++
                 }else if(this.form.standStatus === '1' ){
                     this.form.id = ""
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
index c2eb0f80c..8a5f6397d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
@@ -1216,16 +1216,10 @@
                 if(this.form.standStatus === '2'){
                     this.form.id = ""
                     this.formKey++
-                    if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
-                        this.$message.warning("请选择一条被代替企标编号")
-                        return
-                    }
-                    if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
-                        this.form.standSn = this.form.standNum
-                        this.form.standNumber = this.form.standNum
-                        this.form.standYear = this.regDate(year)
-                        this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
-                    }
+                    this.form.standSn = this.form.standNum
+                    this.form.standNumber = this.form.standNum
+                    this.form.standYear = this.regDate(year)
+                    this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     this.formKey++
                 }else if(this.form.standStatus === '1' ){
                     this.form.id = ""
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
index 105f9373d..cff34d637 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
@@ -1137,16 +1137,10 @@
                 if(this.form.standStatus === '2'){
                     this.form.id = ""
                     this.formKey++
-                    if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
-                        this.$message.warning("请选择一条被代替企标编号")
-                        return
-                    }
-                    if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
-                        this.form.standSn = this.form.standNum
-                        this.form.standNumber = this.form.standNum
-                        this.form.standYear = this.regDate(year)
-                        this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
-                    }
+                    this.form.standSn = this.form.standNum
+                    this.form.standNumber = this.form.standNum
+                    this.form.standYear = this.regDate(year)
+                    this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     this.formKey++
                 }else if(this.form.standStatus === '1' ){
                     this.form.id = ""
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
index 9d39ed11d..8fd1fb3e3 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
@@ -1226,16 +1226,10 @@
                 if(this.form.standStatus === '2'){
                     this.form.id = ""
                     this.formKey++
-                    if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
-                        this.$message.warning("请选择一条被代替企标编号")
-                        return
-                    }
-                    if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
-                        this.form.standSn = this.form.standNum
-                        this.form.standNumber = this.form.standNum
-                        this.form.standYear = this.regDate(year)
-                        this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
-                    }
+                    this.form.standSn = this.form.standNum
+                    this.form.standNumber = this.form.standNum
+                    this.form.standYear = this.regDate(year)
+                    this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     this.formKey++
                 }else if(this.form.standStatus === '1' ){
                     this.form.id = ""
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index 809266cee..1297948fb 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -2487,6 +2487,7 @@
                                 this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                 this.form.topId = this.pId
                                 this.form.reviseStatus = 'buss1_'+this.form.reviseStatus
+                                this.form.textStatusBuss = '6jnqba2mby'
                                 const json = JSON.stringify(this.form);
                                 this.$http.post('lawss/activiti/completeTask', {
                                     taskIds: this.taskIds,
@@ -2702,7 +2703,7 @@
                     this.form.standYear = this.regDate(year)
                     this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                 }else {
-                    this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus}, {
+                    this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort}, {
                         _this: this
                     }, res => {
                         const obj = res.data
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 6390bcbd7..174930b93 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -420,6 +420,25 @@
                 </span>
             </template>
           </el-table-column>
+          <el-table-column
+                  show-overflow-tooltip
+                  prop="reviseStatus"
+                  label="企标制修订状态"
+                  width="120"
+          >
+
+            <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
+                  {{ filterReviseStatus(scope.row.reviseStatus) }}
+                </span>
+              <span v-if="scope.row.standStatusShow === '参考'" style="color: #98E165">
+                  {{ filterReviseStatus(scope.row.reviseStatus) }}
+                </span>
+              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
+                  {{ filterReviseStatus(scope.row.reviseStatus) }}
+                </span>
+            </template>
+          </el-table-column>
 
           <el-table-column fixed="right"
                            v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="收藏" align="center" width="50">
@@ -1190,6 +1209,16 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
+                <el-form-item label="企标制修订状态" title="企标制修订状态" class="add-form-item form-item-disabled">
+                  <el-select v-model="sarBussionessSearch.reviseStatus" title="请选择" filterable clearable @change="getStandInfoByReviseStatus">
+                    <el-option
+                            v-for="item in opinionsStand"
+                            :key="item.value"
+                            :value="item.value"
+                            :label="item.label"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
                 <el-form-item label="发布日期" class="add-form-item form-item-disabled">
                   <el-datePicker v-model="sarBussionessSearch.issueTime"
                                  :editable="false"
@@ -1694,6 +1723,13 @@ export default {
   props: {},
   data() {
     return {
+      opinionsStand:[
+        {value: 'buss1_1',label: '技术标准-制定'},
+        {value: 'buss1_2',label: '技术标准-修订'},
+        {value: 'buss2_1',label: '产品标准-制定'},
+        {value: 'buss2_2',label: '产品标准-修订'},
+        {value: 'buss2_3',label: '产品标准-修订'},
+      ],
       QCBFC: false,  //C类标准展示备案日期
       replaceLawsNumModel: false,
       replaceLawType: '',
@@ -2450,6 +2486,31 @@ export default {
     }
   },
   methods: {
+    filterReviseStatus(data){
+      if(data){
+        if(data.indexOf("buss1_") !== -1){
+          if(data === 'buss1_1'){
+            return "制定"
+          }else if(data === 'buss1_2'){
+            return "修订"
+          }else {
+            return ""
+          }
+        }else if(data.indexOf("buss2_") !== -1){
+          if(data === 'buss2_1'){
+            return "制定"
+          }else if(data === 'buss2_2'){
+            return "修订"
+          }else if(data === 'buss2_3'){
+            return "修改"
+          }else {
+            return ""
+          }
+        }
+      }else {
+        return "";
+      }
+    },
     filterData(data){
         if(data.indexOf(",") !== -1){
             let permission = data.split(",");