Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/bzpg/step4.vue

@@ -148,12 +148,14 @@
           </template>
         </el-table-column>
         <el-table-column
+          v-if="!changePoint"
           prop="technicalRequir"
           align="center"
           width="200px"
           label="核心技术要求/变化点">
         </el-table-column>
         <el-table-column
+          v-if="changePoint"
           prop="changePoint"
           align="center"
           width="200px"

src/pages/processCenter/pages/creatProcess/bzpg/step5.vue

@@ -200,12 +200,14 @@
           </template>
         </el-table-column>
         <el-table-column
+          v-if="!changePoint"
           prop="technicalRequir"
           align="center"
           width="250"
           label="核心技术要求/变化点">
         </el-table-column>
         <el-table-column
+          v-if="changePoint"
           prop="changePoint"
           width="250"
           align="center"

src/pages/processCenter/pages/creatProcess/bzpg/step6.vue

@@ -193,12 +193,14 @@
           </template>
         </el-table-column>
         <el-table-column
+          v-if="!changePoint"
           prop="technicalRequir"
           align="center"
           width="250"
           label="核心技术要求/变化点">
         </el-table-column>
         <el-table-column
+          v-if="changePoint"
           prop="changePoint"
           width="250"
           align="center"

src/pages/processCenter/pages/creatProcess/bzpg/step7.vue

@@ -202,12 +202,14 @@
           </template>
         </el-table-column>
         <el-table-column
+          v-if="!changePoint"
           prop="technicalRequir"
           align="center"
           width="250"
           label="核心技术要求/变化点">
         </el-table-column>
         <el-table-column
+          v-if="changePoint"
           prop="changePoint"
           width="250"
           align="center"

src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue

@@ -202,12 +202,14 @@
           </template>
         </el-table-column>
         <el-table-column
+          v-if="!changePoint"
           prop="technicalRequir"
           align="center"
           width="250"
           label="核心技术要求/变化点">
         </el-table-column>
         <el-table-column
+          v-if="changePoint"
           prop="changePoint"
           width="250"
           align="center"

src/pages/processCenter/pages/creatProcess/bzpg/step8.vue

@@ -202,12 +202,14 @@
           </template>
         </el-table-column>
         <el-table-column
+          v-if="!changePoint"
           prop="technicalRequir"
           align="center"
           width="250"
           label="核心技术要求/变化点">
         </el-table-column>
         <el-table-column
+          v-if="changePoint"
           prop="changePoint"
           width="250"
           align="center"

src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue

@@ -38,14 +38,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled">
-                  <el-input
-                    v-model="qdform.detailedListName"
-                    placeholder="请输入清单名称"
-                    disabled
-                    clearable
-                  ></el-input>
-                </el-form-item>
               </el-col>
             </el-row>
           </el-form>
@@ -105,6 +97,16 @@
             <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="textStatus"
+          label="标准状态"
+          align="center"
+          width="180px"
+        >
+          <template slot-scope="scope">
+            <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="ssrq"
           width="190px"
@@ -123,13 +125,6 @@
           width="190px"
           label="在产车实施日期">
         </el-table-column>
-        <el-table-column
-          prop="zrbm"
-          label="责任部门"
-          align="center"
-          width="180px"
-        >
-        </el-table-column>
       </el-table>
       <div>
         <el-collapse accordion>

src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue

@@ -42,15 +42,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled" style="float: left">
-                  <el-input
-                    v-model="qdform.detailedListName"
-                    placeholder="请输入清单名称"
-                    disabled
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-button size="mini" type="primary" style="margin-top: 1%;" @click="choiceList">选择清单</el-button>
                 <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     :picker-options="pickerOptions"
@@ -125,6 +116,16 @@
             <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="textStatus"
+          label="标准状态"
+          align="center"
+          width="180px"
+        >
+          <template slot-scope="scope">
+            <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="ssrq"
           width="190px"
@@ -143,13 +144,6 @@
           width="190px"
           label="在产车实施日期">
         </el-table-column>
-        <el-table-column
-          prop="zrbm"
-          label="责任部门"
-          align="center"
-          width="180px"
-        >
-        </el-table-column>
       </el-table>
       <el-collapse accordion>
         <el-collapse-item title="回执说明">
@@ -326,141 +320,6 @@
         <el-button type="primary" size="mini" @click="OkProject">带入</el-button>
       </div>
     </el-drawer>
-    <!--   选择清单弹窗-->
-    <el-drawer
-      title="选择清单"
-      :visible.sync="detailedListModel"
-      size="900px"
-      custom-class="demo-drawer"
-    >
-      <div class="demo-drawer-content">
-        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
-          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
-            <div class="left">
-              <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form">
-                <el-form-item label="车型类别" prop="carType" label-width="100px" class="search-item">
-                  <el-select
-                    v-model="sarSarAccessEOSearch.carType"
-                    placeholder="请选择"
-                    filterable
-                    size="small"
-                  >
-                    <el-option
-                      v-for="item in energyKindOptions"
-                      :value="item.value"
-                      :key="item.value"
-                      :label="item.label"
-                    />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="清单名称" class="search-item search-item-last">
-                  <el-input
-                    v-model="sarSarAccessEOSearch.detailedListName"
-                    placeholder="请输入清单名称"
-                  ></el-input>
-                </el-form-item>
-
-                <el-form-item class="search-item btn-box">
-                  <el-button
-                    type="primary"
-                    class="common-button-primary"
-                    size="small"
-                    @click="searchSarAccess">
-                    查询
-                  </el-button>
-                </el-form-item>
-                <el-form-item class="search-item btn-box">
-                  <el-button
-                    class="common-button-default"
-                    size="small"
-                    @click="clearSearchAccess">清空
-                  </el-button>
-                </el-form-item>
-              </el-form>
-            </div>
-            <el-table
-              :data="sarAccessListDatas"
-              tooltip-effect="dark"
-              style="width: 100%; padding: 0 3px"
-              border
-              height="100%"
-              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-              @selection-change="selectListChange"
-              @select="handleSelectionChanges"
-              ref="listSelection"
-            >
-              <el-table-column
-                type="selection"
-                width="55"
-                align="center" />
-              <el-table-column
-                prop="carTypeShow"
-                label="车型类别"
-                align="center">
-              </el-table-column>
-              <el-table-column
-                prop="detailedListName"
-                label="清单名称"
-                align="center"
-                width="260px"
-              >
-                <!--                <template slot-scope="scope">-->
-                <!--                  <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>-->
-                <!--                </template>-->
-              </el-table-column>
-              <el-table-column
-                prop="detailedListState"
-                label="清单状态"
-                align="center">
-                <template slot-scope="scope">
-                  <span v-if="scope.row.detailedListState === '0'">未发布</span>
-                  <span v-if="scope.row.detailedListState === '1'">已发布</span>
-                  <span v-if="scope.row.detailedListState === '3'">审核中</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="detailedListVision"
-                label="清单版本"
-                align="center">
-                <template slot-scope="scope">
-            <span
-              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
-              }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="updateTime"
-                label="更新时间"
-                align="center">
-                <template slot-scope="scope">
-                  <div>
-                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : scope.row.updateTime
-                    }}
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="updatePeople"
-                label="更新人"
-                align="center">
-              </el-table-column>
-            </el-table>
-          </div>
-          <pagination
-            :page="pageNo"
-            :pageSize="pageSizeNo"
-            :total="totalNo"
-            @pageChange="pageChangeNo"
-            @pageSizeChange="pageSizeChangeNo"
-          />
-        </div>
-      </div>
-      <div class="demo-drawer-footer">
-        <el-button size="mini" @click="closeDrawer">取消</el-button>
-        <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
-      </div>
-    </el-drawer>
     <!--    添加标准抽屉-->
     <el-drawer
       title="添加标准"
@@ -963,9 +822,6 @@ export default {
         projectNumber: [
           { type: "string", required: true, message: "请输入项目编号", trigger: "change" }
         ],
-        detailedListName: [
-          { required: true, message: "请输入清单名称", trigger: "change" }
-        ],
         endTime: [
           {required: true, message: '请输入截止时间', trigger: 'change'},
         ],
@@ -1232,6 +1088,7 @@ export default {
         this.qdform.projectNumber = this.selectProject[0].projectNumber;
         this.qdform.projectName = this.selectProject[0].projectName;
         this.qdform.projectId = this.selectProject[0].id;
+        this.getStandData(this.qdform.projectId)
         this.projectModel = false;
       }
 
@@ -1309,7 +1166,7 @@ export default {
     },
     //查询清单下的标准
     getStandData(id) {
-      this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
+      this.$http.get("sarStandProjectLibrary/queryStandInfoNew", {
         id: id,
         page: 1,
         Size: 100

src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue

@@ -38,14 +38,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled">
-                  <el-input
-                    v-model="qdform.detailedListName"
-                    placeholder="请输入清单名称"
-                    disabled
-                    clearable
-                  ></el-input>
-                </el-form-item>
               </el-col>
             </el-row>
           </el-form>
@@ -111,6 +103,16 @@
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
             </template>
           </el-table-column>
+          <el-table-column
+            prop="textStatus"
+            label="标准状态"
+            align="center"
+            width="180px"
+          >
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="ssrq"
             width="190px"
@@ -129,13 +131,6 @@
             width="190px"
             label="在产车实施日期">
           </el-table-column>
-          <el-table-column
-            prop="zrbm"
-            label="责任部门"
-            align="center"
-            width="180px"
-          >
-          </el-table-column>
         </el-table>
       <div>
         <el-collapse accordion>

src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue

@@ -38,14 +38,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled">
-                  <el-input
-                    v-model="qdform.detailedListName"
-                    placeholder="请输入清单名称"
-                    disabled
-                    clearable
-                  ></el-input>
-                </el-form-item>
               </el-col>
             </el-row>
           </el-form>
@@ -111,6 +103,16 @@
             <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="textStatus"
+          label="标准状态"
+          align="center"
+          width="180px"
+        >
+          <template slot-scope="scope">
+            <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="ssrq"
           width="190px"
@@ -129,13 +131,6 @@
           width="190px"
           label="在产车实施日期">
         </el-table-column>
-        <el-table-column
-          prop="zrbm"
-          label="责任部门"
-          align="center"
-          width="180px"
-        >
-        </el-table-column>
       </el-table>
       <div>
         <el-collapse accordion>

src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue

@@ -38,14 +38,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled">
-                  <el-input
-                    v-model="qdform.detailedListName"
-                    placeholder="请输入清单名称"
-                    disabled
-                    clearable
-                  ></el-input>
-                </el-form-item>
               </el-col>
             </el-row>
           </el-form>
@@ -105,6 +97,16 @@
             <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="textStatus"
+          label="标准状态"
+          align="center"
+          width="180px"
+        >
+          <template slot-scope="scope">
+            <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="ssrq"
           width="190px"
@@ -123,13 +125,6 @@
           width="190px"
           label="在产车实施日期">
         </el-table-column>
-        <el-table-column
-          prop="zrbm"
-          label="责任部门"
-          align="center"
-          width="180px"
-        >
-        </el-table-column>
       </el-table>
       <div>
         <el-collapse accordion>