From c85c9b3e7cc877496a98b79277cacece5719f515 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, 6 Jan 2022 16:47:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?ocr=E8=AF=86=E5=88=AB=E6=B6=88=E8=80=97?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localTool/standardRecognition/index.vue   | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue
index 656a7b7f0..61cc5c087 100644
--- a/src/pages/localTool/standardRecognition/index.vue
+++ b/src/pages/localTool/standardRecognition/index.vue
@@ -23,6 +23,7 @@
           style="width: 100%"
           height="100%"
           @selection-change="standSelectChange"
+          @sort-change="sortChange"
           :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
         >
           <el-table-column type="selection" align="center" width="50">
@@ -97,13 +98,13 @@
           </el-table-column>
           <el-table-column
             prop="spendTime"
-            :label="this.$t('m.timeConsuming')"
+            label="消耗时间(秒)"
             align="center"
-            sortable
-            width="120"
+            sortable="custom"
+            width="140"
           >
           </el-table-column>
-          <el-table-column label="操作" align="center" width="150" fixed="right">
+          <el-table-column label="操作" align="center" width="150" >
             <template slot-scope="scope">
               <div @click.stop style="display: inline-block">
                 <el-button
@@ -795,6 +796,8 @@ export default {
       isSubmit: false,
       showUploadlist: true, // 导入过程中新增数据时，如果数据报错，不出现导入列表
       collect: "收藏",
+      paixu: '',
+      shunxu: ''
     };
   },
   props: {},
@@ -1052,6 +1055,26 @@ export default {
           break;*/
       }
     },
+    // 表格排序
+    sortChange (sortObj) {
+      if (sortObj.column.order !== 'normal') {
+        this.shunxu = ''
+        this.paixu = ''
+        let order = sortObj.column.order
+        switch (sortObj.column.property) {
+          case 'spendTime' :
+            // 后台联调
+            this.paixu = 'spendTime'
+            if (order === 'ascending'){
+              this.shunxu = 'asc'
+            } else if (order === 'descending') {
+              this.shunxu = 'desc'
+            }
+            break
+        }
+      }
+      this.getTableData()
+    },
     // 修改成表格样式后，选择项勾选改变
     standSelectChange(data) {
       this.selectTableData = [];
@@ -1336,6 +1359,8 @@ export default {
         {
           page: this.page,
           pageSize: this.pageSize,
+          paixu: this.shunxu ? this.paixu : '',
+          shunxu: this.shunxu
         },
         {
           _this: this,
@@ -1344,6 +1369,7 @@ export default {
         (res) => {
           if (res.ok) {
             this.standRecoList = res.data.list;
+            console.log(this.standRecoList);
             this.total = res.data.count
           }
         },

From 507eeea77294a9c7ff71ac85ec4ef001c076a951 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 6 Jan 2022 17:23:04 +0800
Subject: [PATCH 2/3] commit

---
 .../InputForAllStandards2.vue                 | 106 +++++++++++-------
 .../enterpriseStandardPlan/index.vue          |  13 ++-
 2 files changed, 72 insertions(+), 47 deletions(-)

diff --git a/src/components/CustomFormComponents/InputForAllStandards2.vue b/src/components/CustomFormComponents/InputForAllStandards2.vue
index cd4220446..442e181b3 100644
--- a/src/components/CustomFormComponents/InputForAllStandards2.vue
+++ b/src/components/CustomFormComponents/InputForAllStandards2.vue
@@ -36,15 +36,18 @@
             <div class="search-area">
                 <div class="left">
                     <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
-                        <el-form-item label="编号/名称" class="search-item">
-                            <el-input v-model="replaceLawsNumForm.standNumber" placeholder="根据编号/名称查找" clearable :maxlength="100"></el-input>
+                        <el-form-item label="标准编号" class="search-item">
+                            <el-input v-model="replaceLawsNumForm.standNumber" placeholder="根据标准编号查找" clearable :maxlength="100"></el-input>
+                        </el-form-item>
+                        <el-form-item label="标准名称" class="search-item">
+                            <el-input v-model="replaceLawsNumForm.standName" placeholder="根据标准名称查找" clearable :maxlength="100"></el-input>
                         </el-form-item>
                         <el-form-item label="国内/海外" class="search-item">
                             <el-select
                                     v-model="replaceLawsNumForm.standType"
                                     placeholder="请选择"
                             >
-                                <el-option value="1" label="企标"></el-option>
+                                <el-option v-if="enterpriseStandard" value="1" label="企标"></el-option>
                                 <el-option value="INLAND" label="国内"></el-option>
                                 <el-option value="FOREIGN" label="海外"></el-option>
                             </el-select>
@@ -86,36 +89,44 @@
                 </el-table-column>
                 <el-table-column
                         label="标准编号"
+                        show-overflow-tooltip
                         width="130">
                     <template slot-scope="scope">
-                        <a v-if="scope.row.standYear" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-                        <a v-else @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
+                        <a class="table-jump" v-if="scope.row.standYear" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                        <a class="table-jump" v-else @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
                     </template>
                 </el-table-column>
                 <el-table-column
                         prop="standName"
-                        label="标准名称"
-                        width="130">
+                        show-overflow-tooltip
+                        label="标准名称">
+                    <template slot-scope="scope">
+                        <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
+                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="issueTime"
+                        show-overflow-tooltip
                         label="发布日期"
                         width="130">
                 </el-table-column>
                 <el-table-column
-                        prop="putTime"
                         label="实施日期"
+                        show-overflow-tooltip
                         width="130">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.standType === 'INLAND' || scope.row.standType === 'FOREIGN'">{{ scope.row.ssrq }}</span>
+                        <span v-else>{{ scope.row.putTime }}</span>
+                    </template>
                 </el-table-column>
                 <el-table-column
-                        prop="standNatureShow"
-                        label="标准性质"
-                        width="130">
-                </el-table-column>
-                <el-table-column
-                        prop="standStateShow"
-                        label="标准状态"
+                        label="文本状态"
+                        show-overflow-tooltip
                         width="130">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.standType === 'INLAND' || scope.row.standType === 'FOREIGN'">{{ textStatusMap[scope.row.textStatus] }}</span>
+                        <span v-else>{{ scope.row.standStatusShow }}</span>
+                    </template>
                 </el-table-column>
             </el-table>
             <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -167,10 +178,15 @@
             },
             placeholderText: {
                 type: String
+            },
+            enterpriseStandard: {
+                type: Boolean,
+                default: false
             }
         },
         data () {
             return {
+                textStatusMap: {},
                 replaceLawsNumModel: false,
                 sarBussionessLawsEO: {
                     replaceLawsNum: ''
@@ -178,6 +194,7 @@
                 // 代替标准号
                 replaceLawsNumForm: {
                     standNumber: '', // 政策编号
+                    standName: '',
                     page: 1,
                     pageSize: this.$store.getters.userInfo.configContent,
                     total: 0,
@@ -210,6 +227,11 @@
             }
         },
         methods: {
+            setMap(data) {
+                data.forEach(item => {
+                    this.$set(this.textStatusMap, item.value, item.label)
+                })
+            },
             handleChange (event) {
                 const value = event
                 this.$emit('input', value)
@@ -234,15 +256,6 @@
                     }, res => {
                         this.replaceLawsNumRow = res.data.list
                         this.replaceTotal = res.data.count
-                        // if (this.selectedListRep.length !== 0) {
-                        //     this.selectedListRep.map((list) => {
-                        //         this.replaceLawsNumRow.map((item) => {
-                        //             if (list.id === item.id) {
-                        //                 item._checked = true
-                        //             }
-                        //         })
-                        //     })
-                        // }
                     }, e => {
                     })
                 } else {
@@ -258,15 +271,6 @@
                     }, res => {
                         this.replaceLawsNumRow = res.data.list
                         this.replaceTotal = res.data.count
-                        // if (this.selectedListRep.length !== 0) {
-                        //     this.selectedListRep.map((list) => {
-                        //         this.replaceLawsNumRow.map((item) => {
-                        //             if (list.id === item.id) {
-                        //                 item._checked = true
-                        //             }
-                        //         })
-                        //     })
-                        // }
                     }, e => {
                     })
                 }
@@ -327,14 +331,26 @@
             },
             // 点击查看
             handlePreview (item) {
-                let routeUrl = this.$router.resolve({
-                    name: 'OtherBussStandardDetails',
-                    params: {
-                        id: item.id,
-                        pageType: 'BUSINESS_STAND'
-                    }
-                })
-                window.open(routeUrl.href, '_blank')
+                if (item.standType === 'INLAND' || item.standType === 'FOREIGN') {
+                    let pageType = item.standType === 'INLAND' ? 'INLAND_STAND' : 'FOREIGN_STAND'
+                    let routeUrl = this.$router.resolve({
+                        name: 'OtherStandardDetails',
+                        params: {
+                            id: item.id,
+                            pageType: pageType
+                        }
+                    })
+                    window.open(routeUrl.href, '_blank')
+                } else {
+                    let routeUrl = this.$router.resolve({
+                        name: 'OtherBussStandardDetails',
+                        params: {
+                            id: item.id,
+                            pageType: 'BUSINESS_STAND'
+                        }
+                    })
+                    window.open(routeUrl.href, '_blank')
+                }
             },
             getResetLawsNumRow () {
                 this.replaceLawsNumForm = {
@@ -348,6 +364,14 @@
                 }
                 this.getReplaceLawsNumRow()
             }
+        },
+        mounted() {
+            this.$http.get('sys/dictype/getDicTypeListCode', '', {
+                _this: this
+            }, res => {
+                this.setMap(res.data.WBZTCLASS)
+            }, e => {
+            })
         }
     }
 </script>
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 5c970f03d..be87ace8d 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -118,7 +118,7 @@
                                 prop="reviseStatus"
                                 width="150"
                                 align="center"
-                                label="制修订状态">
+                                label="制修订类型">
                             <template slot-scope="scope">
                             <div>{{ scope.row.reviseStatus === ''? '' : (scope.row.reviseStatus === '1'? '制定' : '修订') }}</div>
                         </template>
@@ -235,7 +235,7 @@
                                             </div>
                                         </el-form-item>
                                         <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-                                            <el-select :disabled="DrawerType === 'see'" v-model="addForm.planStatus" placeholder="请选择计划状态">
+                                            <el-select :disabled="DrawerType === 'see' || DrawerType === 'add' " v-model="addForm.planStatus" placeholder="请选择计划状态">
                                                 <el-option label="未开始" value="0"></el-option>
                                                 <el-option label="制定中" value="1"></el-option>
                                                 <el-option label="修订中" value="2"></el-option>
@@ -243,7 +243,7 @@
                                                 <el-option label="已完成" value="4"></el-option>
                                             </el-select>
                                         </el-form-item>
-                                        <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <el-select :disabled="DrawerType === 'see'" v-model="addForm.reviseStatus" placeholder="请选择制修订状态">
                                                 <el-option label="制定" value="1"></el-option>
                                                 <el-option label="修订" value="2"></el-option>
@@ -357,13 +357,13 @@
                                             </div>
                                         </el-form-item>
                                         <template v-if="addForm.isRelate === '是'">
-                                            <custom-input-for-all-standards
+                                            <custom-input-for-all-standards2
                                                     class="classDisplay"
                                                     :config="{attrName: '采用标准'}"
                                                     :disabled="DrawerType === 'see'"
                                                     :labelWidth="'180px'"
                                                     v-model="addForm.esStandRelations"
-                                            ></custom-input-for-all-standards>
+                                            ></custom-input-for-all-standards2>
                                         </template>
                                         <el-form-item v-if="addForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" class="add-form-item" prop="useLevel" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
@@ -389,6 +389,7 @@
                                         <template>
                                             <custom-input-for-all-standards2
                                                     class="classDisplay"
+                                                    :enterpriseStandard="true"
                                                     :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
                                                     :disabled="DrawerType === 'see'"
                                                     :config="{attrName: '引用标准'}"
@@ -584,7 +585,6 @@
 </template>
 
 <script>
-    import CustomInputForAllStandards from '@/components/CustomFormComponents/InputForAllStandards'
     import CustomInputForAllStandards2 from '@/components/CustomFormComponents/InputForAllStandards2'
     export default {
         name: "enterpriseStandardPlan",
@@ -938,6 +938,7 @@
                 this.addDrawerTitle = '新增'
                 this.addForm = {}
                 this.DrawerType = 'add'
+                this.addForm.planStatus = '0'
                 this.addDrawer = true
             }, // 新增数据
             deleteList () {

From dc8175f5dcecbd4ce2f10ba04655d9576ff869fe 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, 6 Jan 2022 17:40:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qbzxdjhgk/component/establish.vue         | 25 +++++++++++++------
 .../qbzxdjhgk/component/merge.vue             |  5 ++--
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
index 00423d7c1..cfa58cfd8 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -127,14 +127,22 @@
           placeholder="请输入指标依据"
           :maxlength="500"/>
       </el-form-item>
-        <template v-if="qbfsForm.isRelate === '是'">
-          <custom-input-for-all-standards
-            class="classDisplay"
-            :config="{attrName: '采用标准'}"
-            :labelWidth="'180px'"
-            v-model="qbfsForm.esStandRelations"
-          ></custom-input-for-all-standards>
-        </template>
+<!--        <template v-if="qbfsForm.isRelate === '是'">-->
+<!--          <custom-input-for-all-standards-->
+<!--            class="classDisplay"-->
+<!--            :config="{attrName: '采用标准'}"-->
+<!--            :labelWidth="'180px'"-->
+<!--            v-model="qbfsForm.esStandRelations"-->
+<!--          ></custom-input-for-all-standards>-->
+<!--        </template>-->
+      <template v-if="qbfsForm.isRelate === '是'">
+        <custom-input-for-all-standards2
+          class="classDisplay"
+          :config="{attrName: '采用标准'}"
+          :labelWidth="'180px'"
+          v-model="qbfsForm.esStandRelations"
+        ></custom-input-for-all-standards2>
+      </template>
       <el-form-item v-if="qbfsForm.isRelate === '是'" prop="useLevel" label="采标程度" style="width: 100%; margin-right:10px"
                     class="add-form-item form-item-disabled">
         <el-select v-model="qbfsForm.useLevel"  filterable placeholder="请选择采标程度" style="width: 100%;">
@@ -149,6 +157,7 @@
       <template>
         <custom-input-for-all-standards2
           class="classDisplay"
+          :enterpriseStandard="true"
           :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
           :config="{attrName: '引用标准'}"
           :labelWidth="'180px'"
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index 410c5f819..122b25651 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -100,6 +100,7 @@
             <template>
               <custom-input-for-all-standards2
                 class="classDisplay"
+                :enterpriseStandard="true"
                 :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
                 :config="{attrName: '引用标准'}"
                 :labelWidth="'180px'"
@@ -192,12 +193,12 @@
               </el-select>
             </el-form-item>
             <template v-if="qbfsForm.isRelate === '是'">
-              <custom-input-for-all-standards
+              <custom-input-for-all-standards2
                 class="classDisplay"
                 :config="{attrName: '采用标准'}"
                 :labelWidth="'180px'"
                 v-model="qbfsForm.esStandRelations"
-              ></custom-input-for-all-standards>
+              ></custom-input-for-all-standards2>
             </template>
           </el-col>
         </el-row>