From 45373a6a6063ecae8fd3eb075e79ba7d9f1e700e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 28 Dec 2021 15:30:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1-1.vue     | 138 +++++++++---------
 .../pages/creatProcess/bzqdfb/step1.vue       | 138 +++++++++---------
 .../pages/creatProcess/bzqdfb/step3.vue       |  10 +-
 .../pages/creatProcess/bzqdfb/step4.vue       |   2 +
 4 files changed, 147 insertions(+), 141 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
index 2c79ed7ac..bcb421fc3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
@@ -119,7 +119,7 @@
             width="260px"
           >
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -587,75 +587,77 @@
                 </el-form-item>
               </el-form>
             </div>
-            <el-table
-              :data="standardData"
-              tooltip-effect="dark"
-              style="width: 100%"
-              border
-              ref="table"
-              class="table-height"
-              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+            <div class="table-height">
+              <el-table
+                :data="standardData"
+                tooltip-effect="dark"
+                style="width: 100%"
+                border
+                ref="table"
+                height="100%"
+                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-              @selection-change="selectThree"
-            >
-              <el-table-column
-                type="selection"
-                width="55"
-                align="center">
-              </el-table-column>
-              <el-table-column
-                prop="code"
-                align="center"
-                label="标准号">
-                <template slot-scope="scope">
-                  <a v-if="scope.row.standYear" class="table-jump"
-                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
-                      scope.row.standNumber
-                    }}-{{ scope.row.standYear }}</a>
-                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
-                      scope.row.standSortShow
-                    }}
-                    {{ scope.row.standNumber }}</a>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="standName"
-                align="center"
-                label="标准名称"
+                @selection-change="selectThree"
               >
-                <template slot-scope="scope">
-                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="issueTime"
-                align="center"
-                label="发布日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="XCXSSRQ"
-                align="center"
-                label="新车型实施日期">
-              </el-table-column>
-              <el-table-column
-                show-overflow-tooltip
-                prop="ZCCSSRQ"
-                align="center"
-                label="在产车实施日期">
-              </el-table-column>
-              <el-table-column
-                show-overflow-tooltip
-                prop="textStatus"
-                align="center"
-                label="文本状态">
-                <template slot-scope="scope">
-                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
-                </template>
-              </el-table-column>
-            </el-table>
+                <el-table-column
+                  type="selection"
+                  width="55"
+                  align="center">
+                </el-table-column>
+                <el-table-column
+                  prop="code"
+                  align="center"
+                  label="标准号">
+                  <template slot-scope="scope">
+                    <a v-if="scope.row.standYear" class="table-jump"
+                       @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                        scope.row.standNumber
+                      }}-{{ scope.row.standYear }}</a>
+                    <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                        scope.row.standSortShow
+                      }}
+                      {{ scope.row.standNumber }}</a>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="standName"
+                  align="center"
+                  label="标准名称"
+                >
+                  <template slot-scope="scope">
+                    <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName }}</a>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="issueTime"
+                  align="center"
+                  label="发布日期">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="XCXSSRQ"
+                  align="center"
+                  label="新车型实施日期">
+                </el-table-column>
+                <el-table-column
+                  show-overflow-tooltip
+                  prop="ZCCSSRQ"
+                  align="center"
+                  label="在产车实施日期">
+                </el-table-column>
+                <el-table-column
+                  show-overflow-tooltip
+                  prop="textStatus"
+                  align="center"
+                  label="文本状态">
+                  <template slot-scope="scope">
+                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
           </div>
           <pagination
             :page="pageNo"
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 3707f0182..84b22800b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -119,7 +119,7 @@
             width="260px"
           >
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -557,75 +557,77 @@
                 </el-form-item>
               </el-form>
             </div>
-            <el-table
-              :data="standardData"
-              tooltip-effect="dark"
-              style="width: 100%"
-              border
-              ref="table"
-              class="table-height"
-              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+            <div class="table-height">
+              <el-table
+                :data="standardData"
+                tooltip-effect="dark"
+                style="width: 100%"
+                border
+                ref="table"
+                height="100%"
+                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-              @selection-change="selectThree"
-            >
-              <el-table-column
-                type="selection"
-                width="55"
-                align="center">
-              </el-table-column>
-              <el-table-column
-                prop="code"
-                align="center"
-                label="标准号">
-                <template slot-scope="scope">
-                  <a v-if="scope.row.standYear" class="table-jump"
-                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
-                      scope.row.standNumber
-                    }}-{{ scope.row.standYear }}</a>
-                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
-                      scope.row.standSortShow
-                    }}
-                    {{ scope.row.standNumber }}</a>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="standName"
-                align="center"
-                label="标准名称"
+                @selection-change="selectThree"
               >
-                <template slot-scope="scope">
-                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="issueTime"
-                align="center"
-                label="发布日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="XCXSSRQ"
-                align="center"
-                label="新车型实施日期">
-              </el-table-column>
-              <el-table-column
-                show-overflow-tooltip
-                prop="ZCCSSRQ"
-                align="center"
-                label="在产车实施日期">
-              </el-table-column>
-              <el-table-column
-                show-overflow-tooltip
-                prop="textStatus"
-                align="center"
-                label="文本状态">
-                <template slot-scope="scope">
-                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
-                </template>
-              </el-table-column>
-            </el-table>
+                <el-table-column
+                  type="selection"
+                  width="55"
+                  align="center">
+                </el-table-column>
+                <el-table-column
+                  prop="code"
+                  align="center"
+                  label="标准号">
+                  <template slot-scope="scope">
+                    <a v-if="scope.row.standYear" class="table-jump"
+                       @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                        scope.row.standNumber
+                      }}-{{ scope.row.standYear }}</a>
+                    <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                        scope.row.standSortShow
+                      }}
+                      {{ scope.row.standNumber }}</a>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="standName"
+                  align="center"
+                  label="标准名称"
+                >
+                  <template slot-scope="scope">
+                    <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="issueTime"
+                  align="center"
+                  label="发布日期">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="XCXSSRQ"
+                  align="center"
+                  label="新车型实施日期">
+                </el-table-column>
+                <el-table-column
+                  show-overflow-tooltip
+                  prop="ZCCSSRQ"
+                  align="center"
+                  label="在产车实施日期">
+                </el-table-column>
+                <el-table-column
+                  show-overflow-tooltip
+                  prop="textStatus"
+                  align="center"
+                  label="文本状态">
+                  <template slot-scope="scope">
+                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
           </div>
           <pagination
             :page="pageNo"
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index 8dfd0b84c..7128517c9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -111,7 +111,7 @@
             width="260px"
           >
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -311,7 +311,7 @@
                 label="标准名称"
               >
                 <template slot-scope="scope">
-                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
                 </template>
               </el-table-column>
               <el-table-column
@@ -561,12 +561,12 @@ export default {
     },
     //标准查询按钮
     getStandDataBtn(){
-      this.loading = true
+      // this.loading = true
       this.pageNo = 1;
       this.getStandData();
     },
     getStandData() {
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
         standType: this.standardSearch.standType,
         standNumber: this.standardSearch.standNumber,
         page: this.pageNo,
@@ -587,7 +587,7 @@ export default {
     //点击添加事件
     addList() {
       this.standModel = true;
-      this.loading = true
+      // this.loading = true
       this.getStandDataBtn()
     },
     //添加标准select的改变
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
index 3849b15eb..260c2adec 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
@@ -468,6 +468,7 @@ export default {
       if(!this.commentText){
         this.$message.warning('请填写审批意见')
       }else{
+        this.isSubmit = true
         this.listForm.approvalOpinion = "1";
         this.saveLoading = true
         this.listForm.commentText = this.commentText;
@@ -484,6 +485,7 @@ export default {
             this.$router.push("/processCenter");
           }
           this.saveLoading = false
+          this.isSubmit = false
         });
       }/**/
     },