From eeb590619e43cfd250382f6dbc6632a62549ced0 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 28 Dec 2021 21:18:00 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=B5=B7=E5=A4=96?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=20-=20=E5=8F=91=E5=B8=83=E7=A8=BF=20-=20?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=9A=E4=B8=AA=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherStandardDetails/index.vue    | 57 +++++++------------
 1 file changed, 20 insertions(+), 37 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 94b67d827..1c8b5b798 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -69,7 +69,26 @@
                         <label style=" margin-right: 164px;">{{ child.attrName }}</label>
                         <template v-if="child.value && child.value.length > 0"
                                   v-for="(file, fileIndex) in child1Func(child.value)">
-                          <span>
+
+                          <span v-if="child.value && child.value.length > 0 && child.value.length === 1">
+                          <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                             @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                             :title="file.oldFileName">{{ file.oldFileName }}</a>
+                          <i
+                              title="下载"
+                              @click="downloadFile(file.id)"
+                              class="icon-download"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                          />
+                          <i
+                              title="下载带水印"
+                              @click="downloadFileByWater(file.id, file.fileSuffix)"
+                              class="icon-download2"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                          />
+                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                          </span>
+                          <span v-else-if="child.value && child.value.length > 0">
                             <div style="margin-left: 19%">
                           <a style="font-size: 16px;color: #409EFF;cursor: pointer"
                              @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
@@ -105,42 +124,6 @@
 <!--                            更多-->
 <!--                          </el-button>-->
                         </template>
-                        <template v-else-if="child.value && child.value.length > 0 && child.value.length === 1"
-                                  v-for="(file, fileIndex) in child1Func(child.value)">
-                          <span>
-                          <a style="font-size: 16px;color: #409EFF;cursor: pointer"
-                             @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
-                             :title="file.oldFileName">{{ file.oldFileName }}</a>
-                          <i
-                              title="下载"
-                              @click="downloadFile(file.id)"
-                              class="icon-download"
-                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
-                          />
-                          <i
-                              title="下载带水印"
-                              @click="downloadFileByWater(file.id, file.fileSuffix)"
-                              class="icon-download2"
-                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
-                          />
-                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
-                          </span>
-                          <el-button
-                              v-if="child.attrField === itemNam "
-                              v-for="(itemNam,index) in itemExistList"
-                              :key="index"
-                              @click="showItemsModel(child.attrField)"
-                              class="decomposition-btn"
-                              style="right:62px"
-                              icon="icon-separate"
-                          >标准分解单
-                          </el-button>
-                          <!--                          <el-button v-if="child.value && child.value.length > 1"-->
-                          <!--                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
-                          <!--                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">-->
-                          <!--                            更多-->
-                          <!--                          </el-button>-->
-                        </template>
                         <template v-else-if="child.value === null">-</template>
                       </p>
                     </template>

From 3dc48061766023c6abae2236dfb7a6457f1af11b Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 28 Dec 2021 21:23:08 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=B5=B7=E5=A4=96?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=20-=20=E5=8F=91=E5=B8=83=E7=A8=BF=20-=20?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=9A=E4=B8=AA=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 1c8b5b798..233d6e12a 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -69,7 +69,7 @@
                         <label style=" margin-right: 164px;">{{ child.attrName }}</label>
                         <template v-if="child.value && child.value.length > 0"
                                   v-for="(file, fileIndex) in child1Func(child.value)">
-
+<!--                          单个文件时-->
                           <span v-if="child.value && child.value.length > 0 && child.value.length === 1">
                           <a style="font-size: 16px;color: #409EFF;cursor: pointer"
                              @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
@@ -88,6 +88,7 @@
                           />
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                           </span>
+<!--                          多个文件时-->
                           <span v-else-if="child.value && child.value.length > 0">
                             <div style="margin-left: 19%">
                           <a style="font-size: 16px;color: #409EFF;cursor: pointer"

From 7285c160d2bab2545993f9bee2dd6a8520638287 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Wed, 29 Dec 2021 09:36:26 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=B8=8E=E7=BC=96=E8=BE=91=E6=A1=86=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standAutoSplit/pages/itemSplitInfo.vue    | 215 +++++++++++++++---
 1 file changed, 179 insertions(+), 36 deletions(-)

diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index 7291d830e..e996b9f6f 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -319,7 +319,7 @@
       @close="showItemInfoModal = false"
       class="demo-drawer"
     >
-      <div class="see-drawer-content">
+<!--      <div class="see-drawer-content">
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="条款号">条款号</label>
           <span class="see-drawer-val" :title="showItemInfoEO.itemsNum">{{ showItemInfoEO.itemsNum }}</span>
@@ -332,7 +332,7 @@
           <label class="see-drawer-name" title="内容简介">内容简介</label>
           <span class="see-drawer-val" :title="showItemInfoEO.itermsConditions ? showItemInfoEO.itermsConditions.replace(/<.*?>/ig, ' ') : ''">{{ showItemInfoEO.itermsConditions ? showItemInfoEO.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</span>
         </div>
-<!--        <div class="see-drawer-div">
+        <div class="see-drawer-div">
           <label class="see-drawer-name" title="责任部门">责任部门</label>
           <span class="see-drawer-val" :title="showItemInfoEO.responsibleUnitShow">{{ showItemInfoEO.responsibleUnitShow }}</span>
         </div>
@@ -359,7 +359,123 @@
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>
           <span class="see-drawer-val" :title="getDicTypeName('BZFGGXOUIUJ', showItemInfoEO.busStandCover)">{{ getDicTypeName('BZFGGXOUIUJ', showItemInfoEO.busStandCover) }}</span>
-        </div>-->
+        </div>
+      </div>-->
+      <div class="demo-drawer-content">
+        <el-form
+          ref="sarStandardsItemForm"
+          :model="standItemEO"
+          class="label-input-form"
+          :rules="sarStandardItemRules"
+          label-width="150px"
+        >
+          <el-input v-model="standItemEO.id" v-if="false"></el-input>
+          <el-form-item  label="条款号" prop="itemsNum" class="add-form-item">
+            <el-input v-model="standItemEO.itemsNum" readonly placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item label="条款名称" prop="itemsName" class="add-form-item">
+            <el-input v-model="standItemEO.itemsName" readonly placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <!--          <custom-org
+                        key="责任部门"
+                        :config="{
+                          attrName: '责任部门',
+                          attrField: 'responsibleUnit',
+                          selVal: 'ORGLIST',
+                          valueName: standItemEO.responsibleUnitShow
+                        }"
+                        v-model="standItemEO.ZRBM"
+                        @on-checked="onChecked"
+                    ></custom-org>
+                    <custom-org
+                      key="FO"
+                      :config="{
+                        attrName: 'FO',
+                        attrField: 'FO',
+                        selVal: 'ROLELIST',
+                        valueName: standItemEO.foShow
+                      }"
+                      v-model="standItemEO.fo"
+                      check-enable
+                      :data-model="standItemEO"
+                      @on-checked="checkedName => {standItemEO.foShow = checkedName}"
+                    ></custom-org>
+                    <custom-role-tree
+                      :key = "Math.random() + 'dutyEngineer'"
+                      :config="{
+                        attrName: '项目评估角色',
+                        attrField: 'dutyEngineer',
+                        valueName: standItemEO.dutyEngineerShow
+                      }"
+                      v-model="standItemEO.dutyEngineer"
+                      :data-model="standItemEO"
+                      @on-checked="checkedName => {standItemEO.dutyEngineerShow = checkedName}"
+                    ></custom-role-tree>
+                    <custom-SVPPS
+                      :key = "Math.random() + 'svpps'"
+                      :config="{
+                        attrName: 'SVPPS',
+                        attrField: 'svpps',
+                        valueName: standItemEO.svppsShow
+                      }"
+                      v-model="standItemEO.svpps"
+                      :data-model="standItemEO"
+                      @on-checked="checkedName => {standItemEO.svppsShow = checkedName}"
+                    ></custom-SVPPS>
+                    <el-form-item label="适用车辆类型" prop="applyArctic" class="add-form-item">
+                      <el-select v-model="standItemEO.applyArctic" multiple placeholder="请选择" :filterable="true">
+                        <el-option
+                          v-for="opt in applyArcticOptions"
+                          :key="opt.value"
+                          :label="opt.label"
+                          :value="opt.value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="要求类型" prop="claimType" class="add-form-item">
+                      <el-select v-model="standItemEO.claimType" placeholder="请选择" :filterable="true">
+                        <el-option
+                          v-for="opt in requestOptions"
+                          :key="opt.value"
+                          :label="opt.label"
+                          :value="opt.value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="企标覆盖关系" prop="busStandCover" class="add-form-item">
+                      <el-select v-model="standItemEO.busStandCover" placeholder="请选择">
+                        <el-option
+                          v-for="item in BZFGGXOUIUJ"
+                          :key="item.value"
+                          :value="item.value"
+                          :label="item.label"></el-option>
+                      </el-select>
+                    </el-form-item>-->
+          <el-divider content-position="left">内容简介</el-divider>
+          <div style="border:1px dashed #999;margin-bottom:20px;padding:10px">
+            <div v-for="(item, index) in itemsContentList" :key="index">
+              <el-row>
+                <el-col :span="18" v-if="item.type === 'TEXT'">
+                  <el-input v-model.trim="item.id" v-if="false"></el-input>
+                  <el-input type="textarea" :autosize="true" readonly class="updateContentInput" v-model.trim="item.itemContent" placeholder="请输入" clearable :maxlength="1000"></el-input>
+                </el-col>
+                <el-col :span="16" v-if="item.type === 'IMG'">
+                  <div style="padding-top: 10px">
+                    <el-input v-model.trim="item.id" v-if="false"></el-input>
+                    <div style="width: 30%;height: 30%;"  v-html="item.itemContent" @click="previewImage(item.itemContent)">{{item.itemContent}}</div>
+                  </div>
+                </el-col>
+                <el-col :span="16" v-if="item.type === 'TABLE'">
+                  <div style="padding-top: 10px" class="wordTableStyle">
+                    <el-input v-model.trim="item.id" v-if="false"></el-input>
+                    <div class="updateContentInput" v-html="item.itemContent">
+                    </div>
+                  </div>
+                </el-col>
+              </el-row>
+            </div>
+          </div>
+        </el-form>
       </div>
     </el-drawer>
     <!--编辑条款内容-->
@@ -1873,35 +1989,6 @@ export default {
         })
       }
     },
-    // 获取关联文件名称
-    getFileName (row) {
-      this.referanceStandList = []
-      if (row.referenceStand != null && row.referenceStand !== '') {
-        this.referanceStandList = row.referenceStand.split(',')
-      }
-      if (row.relevanceFile === null) {
-        this.standItemEO.FileNameList = []
-        this.showItemInfoModal = true
-        return false
-      } else {
-        this.$http.get('att/attFile/getMultiFileInfos', {
-          fileIds: row.relevanceFile
-        }, {
-          _this: this
-        }, res => {
-          // let fileNameList = []
-          // this.standItemEO.relevanceFileName = ''
-          // res.data.map((item) => {
-          //   fileNameList.push(item.oldFileName)
-          // })
-          // this.standItemEO.relevanceFileName = fileNameList.join('；')
-          this.standItemEO.FileNameList = res.data
-          this.showItemInfoModal = true
-        }, e => {
-          this.showItemInfoModal = true
-        })
-      }
-    },
     addSpecialRequest (item, index) {
       let specialObj = {
         description: '',
@@ -2084,7 +2171,7 @@ export default {
         //   this.clause(command[0])
         //   break
         case '属性':
-          this.attribute(command[0])
+          this.attribute(command[2], command[0])
           break
         case '编辑':
           this.editLawsInfo(command[2], command[0])
@@ -2154,9 +2241,65 @@ export default {
       this.showItemRequestDetails()
     },
     // 点击表格 属性按钮事件
-    attribute (row) {
-      this.getFileName(row)
-      this.showItemInfoEO = JSON.parse(JSON.stringify(row))
+    attribute (index, row) {
+      this.isSubmit = false
+      this.standItemEO.id = row.id
+      this.showItemInfoModal = true
+      this.saveEditItemIndex = index
+      this.standItemEO = JSON.parse(JSON.stringify(row))
+      if (this.standItemEO.applyArctic && !(this.standItemEO.applyArctic instanceof Array)) {
+        let a = this.standItemEO.applyArctic.split(',')
+        this.standItemEO.applyArctic = a // 适用车型
+      }
+      if (this.standItemEO.newcarPutTime != null && this.standItemEO.newcarPutTime !== '') {
+        this.standItemEO.newcarPutTime = this.standItemEO.newcarPutTime.replace(new RegExp(/-/gm), '/')
+        this.standItemEO.newcarPutTime = new Date(this.standItemEO.newcarPutTime)
+      }
+      if (this.standItemEO.productPutTime != null && this.standItemEO.productPutTime !== '') {
+        this.standItemEO.productPutTime = this.standItemEO.productPutTime.replace(new RegExp(/-/gm), '/')
+        this.standItemEO.productPutTime = new Date(this.standItemEO.productPutTime)
+      }
+      if (this.standItemEO.paramsList == null || this.standItemEO.paramsList.length < 1) {
+        let specialObj = {
+          description: '',
+          figure: ''
+        }
+        this.standItemEO.paramsList.push(specialObj)
+      }
+      this.standItemEO.ZRBM = this.standItemEO.responsibleUnit
+      this.saveItemId = row.id
+      this.showUpdateItemInfo()
+      // this.getFileName(row)
+      // this.showItemInfoEO = JSON.parse(JSON.stringify(row))
+    },
+    // 获取关联文件名称
+    getFileName (row) {
+      this.referanceStandList = []
+      if (row.referenceStand != null && row.referenceStand !== '') {
+        this.referanceStandList = row.referenceStand.split(',')
+      }
+      if (row.relevanceFile === null) {
+        this.standItemEO.FileNameList = []
+        this.showItemInfoModal = true
+        return false
+      } else {
+        this.$http.get('att/attFile/getMultiFileInfos', {
+          fileIds: row.relevanceFile
+        }, {
+          _this: this
+        }, res => {
+          // let fileNameList = []
+          // this.standItemEO.relevanceFileName = ''
+          // res.data.map((item) => {
+          //   fileNameList.push(item.oldFileName)
+          // })
+          // this.standItemEO.relevanceFileName = fileNameList.join('；')
+          this.standItemEO.FileNameList = res.data
+          this.showItemInfoModal = true
+        }, e => {
+          this.showItemInfoModal = true
+        })
+      }
     },
     getDicTypeName(opt, type) {
       const _type = type ? type.split(',') : []

From 54c50bd0b637cbec6cb1676efc4015f3ea1ac4f6 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Wed, 29 Dec 2021 09:54:38 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg2/step1-12.vue     | 29 ++++---------------
 .../pages/creatProcess/xmpg2/step10.vue       |  5 ++++
 .../pages/creatProcess/xmpg2/step11.vue       |  5 ++++
 .../pages/creatProcess/xmpg2/step12.vue       |  5 ++++
 .../pages/creatProcess/xmpg2/step7.vue        | 29 ++++---------------
 .../pages/creatProcess/xmpg2/step8.vue        |  5 ++++
 .../pages/creatProcess/xmpg2/step9.vue        |  5 ++++
 7 files changed, 35 insertions(+), 48 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
index b69e1ff75..0e6f8e884 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
@@ -155,6 +155,8 @@
           background
           :page-sizes="[20, 40, 60]"
           :total="total"
+          :page-size="pageSize"
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         >
         </el-pagination>
@@ -297,30 +299,6 @@ export default {
       });
       window.open(routeUrl.href, "_blank");
     },
-    //查询项目下的标准
-    getStandData() {
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
-        standType: this.standardSearch.standType,
-        standNumber: this.standardSearch.standNumber,
-        page: this.pageNo,
-        pageSize: this.pageSizeNo
-      }, {
-        _this: this
-      }, res => {
-        this.standardData = res.data.list;
-        this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
-            this.$set(item, "ZCCSSRQ", '');
-            this.$set(item, "XCXSSRQ", '');
-          }else{
-            this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
-            this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
-          }
-        })
-        this.totalNo = res.data.count;
-      }, e => {
-      });
-    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -398,6 +376,9 @@ export default {
     handleCurrentChange(currentPage) {
       this.currentPage = currentPage;
     },
+    handleSizeChange(size) {
+      this.pageSize = size;
+    },
     //驳回事件
     beforeBack() {
       if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
index 89d261398..d53a543b5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
@@ -200,6 +200,8 @@
           background
           :page-sizes="[20, 40, 60]"
           :total="total"
+          :page-size="pageSize"
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         >
         </el-pagination>
@@ -551,6 +553,9 @@ export default {
     handleCurrentChange(currentPage) {
       this.currentPage = currentPage;
     },
+    handleSizeChange(size) {
+      this.pageSize = size;
+    },
   },
   computed: {
     listNoDataText() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
index 4df5c1836..984ad8d2b 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
@@ -200,6 +200,8 @@
           background
           :page-sizes="[20, 40, 60]"
           :total="total"
+          :page-size="pageSize"
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         >
         </el-pagination>
@@ -526,6 +528,9 @@ export default {
     handleCurrentChange(currentPage) {
       this.currentPage = currentPage;
     },
+    handleSizeChange(size) {
+      this.pageSize = size;
+    },
   },
 
   computed: {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
index 775f91db2..fba54c8cb 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
@@ -200,6 +200,8 @@
           background
           :page-sizes="[20, 40, 60]"
           :total="total"
+          :page-size="pageSize"
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         >
         </el-pagination>
@@ -551,6 +553,9 @@ export default {
     handleCurrentChange(currentPage) {
       this.currentPage = currentPage;
     },
+    handleSizeChange(size) {
+      this.pageSize = size;
+    },
   },
   computed: {
     listNoDataText() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index 70d0b79c0..2e7651a5d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -158,6 +158,8 @@
           background
           :page-sizes="[20, 40, 60]"
           :total="total"
+          :page-size="pageSize"
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         >
         </el-pagination>
@@ -367,30 +369,6 @@ export default {
       });
       window.open(routeUrl.href, "_blank");
     },
-    //查询项目下的标准
-    getStandData() {
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
-        standType: this.standardSearch.standType,
-        standNumber: this.standardSearch.standNumber,
-        page: this.pageNo,
-        pageSize: this.pageSizeNo
-      }, {
-        _this: this
-      }, res => {
-        this.standardData = res.data.list;
-        this.standardData.forEach(item => {
-          if (item.attrInfoMap === null) {
-            this.$set(item, "ZCCSSRQ", "");
-            this.$set(item, "XCXSSRQ", "");
-          } else {
-            this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
-            this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
-          }
-        });
-        this.totalNo = res.data.count;
-      }, e => {
-      });
-    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -509,6 +487,9 @@ export default {
     handleCurrentChange(currentPage) {
       this.currentPage = currentPage;
     },
+    handleSizeChange(size) {
+      this.pageSize = size;
+    },
   },
   computed: {
     listNoDataText() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
index e2f7bb78a..8efce2454 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
@@ -198,6 +198,8 @@
           background
           :page-sizes="[20, 40, 60]"
           :total="total"
+          :page-size="pageSize"
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         >
         </el-pagination>
@@ -549,6 +551,9 @@ export default {
     handleCurrentChange(currentPage) {
       this.currentPage = currentPage;
     },
+    handleSizeChange(size) {
+      this.pageSize = size;
+    },
   },
   computed: {
     listNoDataText() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
index ccb983998..9fac7b4aa 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
@@ -200,6 +200,8 @@
           background
           :page-sizes="[20, 40, 60]"
           :total="total"
+          :page-size="pageSize"
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         >
         </el-pagination>
@@ -551,6 +553,9 @@ export default {
     handleCurrentChange(currentPage) {
       this.currentPage = currentPage;
     },
+    handleSizeChange(size) {
+      this.pageSize = size;
+    },
   },
   computed: {
     listNoDataText() {

From ad82276e182ad4ff3fc8f6ea893a8506a958cc5f Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Wed, 29 Dec 2021 10:45:19 +0800
Subject: [PATCH 05/15] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=20-=20=E6=98=AF=E5=90=A6=E7=BA=B3=E5=85=A5=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=20-=20=E6=B7=BB=E5=8A=A0=E5=8F=AF?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 4de50bcb7..28587330f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -126,6 +126,7 @@
                     <el-radio label="1">是</el-radio>
                     <el-radio label="2">否</el-radio>
                   </el-radio-group>
+                  <el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess.length>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
                 </el-form-item>
                 <el-form-item v-if="verifySarStandard && form.standInData === '0' " label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
                   <el-input v-model="form.standSystem" clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
@@ -3122,6 +3123,9 @@ export default {
 @import '~@/assets/styles/style';
 
 .bzrkStep1 {
+  /deep/ .el-button--mini.is-circle {
+    padding: 2px;
+  }
   /deep/ .prc-content-border .form-item-disabled .el-form-item__content .el-input .el-input__inner {
     width: 70%;
   }

From 3917ef308faba61e718e4045a3f7f460a32410b4 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Wed, 29 Dec 2021 10:47:35 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherStandardDetails/index.vue    | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 233d6e12a..1404296b9 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -90,23 +90,23 @@
                           </span>
 <!--                          多个文件时-->
                           <span v-else-if="child.value && child.value.length > 0">
-                            <div style="margin-left: 19%">
-                          <a style="font-size: 16px;color: #409EFF;cursor: pointer"
-                             @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
-                             :title="file.oldFileName">{{ file.oldFileName }}</a>
-                          <i
-                              title="下载"
-                              @click="downloadFile(file.id)"
-                              class="icon-download"
-                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
-                          />
-                          <i
-                              title="下载带水印"
-                              @click="downloadFileByWater(file.id, file.fileSuffix)"
-                              class="icon-download2"
-                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
-                          />
-                              </div>
+                            <span style="margin-left: 19%">
+                              <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                                 @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                                 :title="file.oldFileName">{{ file.oldFileName }}</a>
+                              <i
+                                  title="下载"
+                                  @click="downloadFile(file.id)"
+                                  class="icon-download"
+                                  v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                              />
+                              <i
+                                  title="下载带水印"
+                                  @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                  class="icon-download2"
+                                  v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                              />
+                            </span>
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                           </span>
                           <el-button

From b39ffb58780f6edcb32ceb7bbe13db32e552c4fc Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 29 Dec 2021 11:27:19 +0800
Subject: [PATCH 07/15] feat: There is no way the,buss plan add bussSort

---
 .../enterpriseStandardPlan/index.vue          | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index d93411e8d..ef5a30c9e 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -90,6 +90,12 @@
                                 align="center"
                                 width="55">
                         </el-table-column>
+                        <el-table-column
+                                prop="bussSort"
+                                label="企标类别"
+                                align="center"
+                                width="120">
+                        </el-table-column>
                         <el-table-column
                                 prop="esName"
                                 label="企标名称"
@@ -196,6 +202,16 @@
                             <el-row :gutter="24">
                                 <el-col :span="24">
                                     <el-form :model="addForm" inline class="label-input-form" label-width="180px"  :rules="addFormRules" ref="addForm">
+                                        <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                            <el-select v-model="addForm.bussSort" filterable clearable placeholder="" style="appearance: none">
+                                                <el-option
+                                                        v-for="item in standSortOptions"
+                                                        :key="item.value"
+                                                        :value="item.value"
+                                                        :label="item.label"
+                                                ></el-option>
+                                            </el-select>
+                                        </el-form-item>
                                         <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <el-input
                                                     :disabled="DrawerType === 'see'"
@@ -556,6 +572,7 @@
                 TXJGList: [],
                 TXJGmodal: false,
                 standSystemOptions: [],
+                standSortOptions: [],
                 defaultProps: {
                     children: 'children',
                     label: 'menuName'
@@ -591,6 +608,7 @@
                 DrawerType: '',
                 ids: [],
                 addForm: {
+                    bussSort:'',
                     esMatingRelations: '',
                     technologic: '',
                     useLevel: '',
@@ -623,6 +641,9 @@
                     esName: [
                         {required: true, message: '请输入企标名称', trigger: 'blur'},
                     ],
+                    bussSort: [
+                        {required: true, message: '请选择企标类别', trigger: 'change'},
+                    ],
                     planStatus: [
                         {required: true, message: '请选择计划状态', trigger: 'change'},
                     ],
@@ -941,6 +962,7 @@
                         this.DrawerType = 'edit'
                         this.addDrawer = true
                         this.addForm = {
+                            bussSort: command[0].bussSort,
                             esMatingRelations: command[0].esMatingRelations,
                             technologic: command[0].technologic,
                             useLevel: command[0].useLevel,
@@ -1025,6 +1047,7 @@
             }, res => {
                 this.QCDWList = res.data.QCDW // 起草单位
                 this.standSystemOptions = res.data.TXLBBUSS // 体系结构
+                this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
                 this.BZList = res.data.ENERGYTYPES
             }, e => {
             })

From f8f0b695629f5650bdf8a8916d84cd4a56d830c0 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 29 Dec 2021 13:51:26 +0800
Subject: [PATCH 08/15] feat: There is no way the,buss hh process

---
 .../processCenter/pages/creatProcess/qbrk/common/formList.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
index c927509da..8f4833d00 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
@@ -305,7 +305,7 @@ export default {
     },
     summaryFileList: {
       type: Array,
-      required: true
+      required: false
     },
     disabledState: {
       type: Boolean,

From 37e1fb3b9417f442f49746666f54f459ec840104 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Wed, 29 Dec 2021 14:06:24 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=B9=8B=E5=89=8D=E4=B8=8D=E5=8F=AF=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standCalendar/index.vue   | 25 +++++++++++++++++--
 .../pages/creatProcess/bzhHy-ch/step1.vue     |  9 ++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue
index 24e890362..a00639dc4 100644
--- a/src/pages/localTool/standCalendar/index.vue
+++ b/src/pages/localTool/standCalendar/index.vue
@@ -174,10 +174,11 @@
               </el-table-column>
             </el-table>
           </el-form-item>
-          <el-form-item class="add-form-item" label="会议时间:">
+          <el-form-item class="picker_style" style="margin-bottom: 0;min-height: 50px;line-height: 50px;border-bottom: 1px dashed #e5e5e5;" label="会议时间:">
             <el-date-picker
               v-model="editMeetForm.date"
               type="datetime"
+              :picker-options="datePicker"
               value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期时间"
               align="right">
@@ -339,7 +340,13 @@ export default {
       // 议题选中时储存数组
       deleteTable: [],
       loading: false,
-      dialogTitle: ''
+      dialogTitle: '',
+
+      datePicker: {
+        disabledDate(date) {
+          return date.getTime() <  Date.now() - 24 * 60 * 60 * 1000
+        }
+      }
     }
   },
   mounted() {
@@ -819,6 +826,19 @@ export default {
 @import '~@/assets/styles/style';
 
 .standCalendar {
+  .content_form {
+    /deep/.el-input--suffix .el-input__inner {
+      border: 0;
+    }
+    label-input-form {
+      .picker_style {
+        margin-bottom: 0;
+        min-height: 50px;
+        line-height: 50px;
+        border-bottom: 1px dashed #e5e5e5;
+      }
+    }
+  }
   .date-picker {
     .item {
       /deep/ .el-input {
@@ -874,6 +894,7 @@ export default {
     margin-top: 50px;
   }
 
+
   .card_info {
     height: 190px;
     margin-top: 10px;
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
index 31875535c..ce92499e4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
@@ -82,6 +82,7 @@
                   <el-date-picker
                     v-model="ch_pageData.meetingStartTime"
                     type="datetime"
+                    :picker-options="datePicker"
                     value-format="yyyy-MM-dd HH:mm:ss"
                     placeholder="选择日期时间"
                     align="right">
@@ -453,7 +454,13 @@ export default {
       isSubmit: false,
       saveLoading: false,
       commentInfo: '',
-      bpnId: ''
+      bpnId: '',
+      // 设置当前日期之前不可选择
+      datePicker: {
+        disabledDate(date) {
+          return date.getTime() <  Date.now() - 24 * 60 * 60 * 1000
+        }
+      }
     }
   },
   mounted() {

From abb197c50905792482923a171629be6b1605e942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 29 Dec 2021 14:09:25 +0800
Subject: [PATCH 10/15] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E7=AB=8B=E9=A1=B9?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qbzxdjhgk/component/cancel.vue            |  90 +++-
 .../qbzxdjhgk/component/delay.vue             |  94 +++-
 .../qbzxdjhgk/component/establish.vue         | 476 +++++++++++++++---
 .../qbzxdjhgk/component/merge.vue             | 387 +++++++++++++-
 .../qbzxdjhgk/component/rename.vue            |  76 +++
 .../pages/creatProcess/qbzxdjhgk/step1-5.vue  |  82 ++-
 .../pages/creatProcess/qbzxdjhgk/step1.vue    |  20 +-
 .../pages/creatProcess/qbzxdjhgk/step2.vue    |  68 +++
 .../pages/creatProcess/qbzxdjhgk/step3.vue    |  67 +++
 .../pages/creatProcess/qbzxdjhgk/step4.vue    |  67 +++
 .../pages/creatProcess/qbzxdjhgk/step5.vue    |  67 +++
 11 files changed, 1377 insertions(+), 117 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
index e77ff7e04..91ba66aff 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
@@ -54,13 +54,26 @@
                 placeholder="请选择初稿完成时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
+            <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
               <el-input
-                type="textarea"
-                v-model="qbfsForm.cancelReason"
-                placeholder="请输入取消原因"
-                clearable
-              ></el-input>
+                disabled
+                v-model="qbfsForm.rqbName"
+                placeholder="请输入企业标准"
+                :maxlength="500"/>
+            </el-form-item>
+            <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
+              <el-input
+                disabled
+                v-model="qbfsForm.tsJsonName"
+                placeholder="请输入体系结构"
+                :maxlength="500"/>
+            </el-form-item>
+            <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+              <el-input
+                disabled
+                v-model="qbfsForm.esMatingRelations"
+                placeholder="请输入配套标准"
+                :maxlength="500"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -116,6 +129,52 @@
                 ></el-input>
               </div>
             </el-form-item>
+            <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                          class="add-form-item form-item-disabled">
+              <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+                <el-option
+                  v-for="item in BZList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+              <el-input
+                disabled
+                v-model="qbfsForm.isRelate"
+                placeholder="请输入是否引用标准"
+                :maxlength="500"/>
+            </el-form-item>
+            <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
+              <el-input
+                disabled
+                v-model="qbfsForm.technologic"
+                placeholder="请输入是否引用标准"
+                :maxlength="500"/>
+            </el-form-item>
+            <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
+              <el-input
+                disabled
+                v-model="qbfsForm.esStandRelations"
+                placeholder="请输入采用标准"
+                :maxlength="500"/>
+            </el-form-item>
+            <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+              <el-input
+                disabled
+                v-model="qbfsForm.useLevel"
+                placeholder="请输入采标程度"
+                :maxlength="500"/>
+            </el-form-item>            <el-form-item label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
+              <el-input
+                type="textarea"
+                v-model="qbfsForm.cancelReason"
+                placeholder="请输入取消原因"
+                clearable
+              ></el-input>
+            </el-form-item>
           </el-col>
         </el-row>
       </div>
@@ -268,12 +327,13 @@ export default {
     return{
       formRules: {
         cancelReason: [
-          {required: true, message: '请输入延期原因', trigger:'blur'},
+          {required: true, message: '请输入取消原因', trigger:'blur'},
         ]
 
       },
       ListModel: false,
       standinfoList: [],
+      BZList: [],
       page: 1,
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
@@ -311,6 +371,12 @@ export default {
     if(!this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods: {
     validateForm () {
@@ -372,6 +438,16 @@ export default {
         this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
         this.qbfsForm.unitName = this.selectList[0].unitName
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
+        if(this.selectList[0].area){
+          this.qbfsForm.area = this.selectList[0].area.split(',')
+        }
+        this.qbfsForm.rqbName = this.selectList[0].rqbName
+        this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
+        this.qbfsForm.isRelate = this.selectList[0].isRelate
+        this.qbfsForm.useLevel = this.selectList[0].useLevel
+        this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
+        this.qbfsForm.technologic = this.selectList[0].technologic
+        this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
         this.ListModel = false
       }
     },
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
index 33119c5c4..63da88cbe 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
@@ -54,6 +54,27 @@
                placeholder="请选择初稿完成时间">
              </el-date-picker>
            </el-form-item>
+           <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+             <el-input
+               disabled
+               v-model="qbfsForm.rqbName"
+               placeholder="请输入企业标准"
+               :maxlength="500"/>
+           </el-form-item>
+           <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
+             <el-input
+               disabled
+               v-model="qbfsForm.tsJsonName"
+               placeholder="请输入体系结构"
+               :maxlength="500"/>
+           </el-form-item>
+           <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+             <el-input
+               disabled
+               v-model="qbfsForm.esMatingRelations"
+               placeholder="请输入配套标准"
+               :maxlength="500"/>
+           </el-form-item>
            <el-form-item label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
              <el-date-picker
                v-model="qbfsForm.yqDraftTime"
@@ -62,14 +83,6 @@
                placeholder="请选择延期后初稿完成时间">
              </el-date-picker>
            </el-form-item>
-           <el-form-item label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
-             <el-input
-               type="textarea"
-               v-model="qbfsForm.delayReason"
-               placeholder="请输入延期原因"
-               clearable
-             ></el-input>
-           </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item   prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
@@ -124,6 +137,45 @@
                ></el-input>
              </div>
            </el-form-item>
+           <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                         class="add-form-item form-item-disabled">
+             <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+               <el-option
+                 v-for="item in BZList"
+                 :key="item.value"
+                 :label="item.label"
+                 :value="item.value">
+               </el-option>
+             </el-select>
+           </el-form-item>
+           <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+             <el-input
+               disabled
+               v-model="qbfsForm.isRelate"
+               placeholder="请输入是否引用标准"
+               :maxlength="500"/>
+           </el-form-item>
+           <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
+             <el-input
+               disabled
+               v-model="qbfsForm.technologic"
+               placeholder="请输入是否引用标准"
+               :maxlength="500"/>
+           </el-form-item>
+           <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
+             <el-input
+               disabled
+               v-model="qbfsForm.esStandRelations"
+               placeholder="请输入采用标准"
+               :maxlength="500"/>
+           </el-form-item>
+           <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+             <el-input
+               disabled
+               v-model="qbfsForm.useLevel"
+               placeholder="请输入采标程度"
+               :maxlength="500"/>
+           </el-form-item>
            <el-form-item label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
              <el-date-picker
                v-model="qbfsForm.yqReleaseTime"
@@ -132,6 +184,14 @@
                placeholder="请选择延期后标准发布时间">
              </el-date-picker>
            </el-form-item>
+           <el-form-item label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
+             <el-input
+               type="textarea"
+               v-model="qbfsForm.delayReason"
+               placeholder="请输入延期原因"
+               clearable
+             ></el-input>
+           </el-form-item>
          </el-col>
        </el-row>
      </div>
@@ -282,6 +342,7 @@ export default {
   props: ['message'],
   data(){
     return{
+      BZList: [],
       formRules: {
         yqDraftTime: [
           { required: true, message: '请选择延期后初稿完成时间', trigger: 'blur' },
@@ -332,6 +393,12 @@ export default {
     if(!this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods: {
     validateForm () {
@@ -378,6 +445,7 @@ export default {
     },
     //带入标准
     OkDrawer(){
+      console.log(this.selectList);
       if(this.selectList.length > 1){
         this.$message.warning('您只能带入一条标准')
       }else if(this.selectList.length < 1){
@@ -393,6 +461,16 @@ export default {
         this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
         this.qbfsForm.unitName = this.selectList[0].unitName
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
+        if(this.selectList[0].area){
+          this.qbfsForm.area = this.selectList[0].area.split(',')
+        }
+        this.qbfsForm.rqbName = this.selectList[0].rqbName
+        this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
+        this.qbfsForm.isRelate = this.selectList[0].isRelate
+        this.qbfsForm.useLevel = this.selectList[0].useLevel
+        this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
+        this.qbfsForm.technologic = this.selectList[0].technologic
+        this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
         this.ListModel = false
       }
     },
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
index 6bed46d34..a952cac68 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div id="establish">
     <process-title>
       <template slot="title">立项信息</template>
     </process-title>
@@ -17,58 +17,22 @@
           placeholder="请输入企标名称"
           :maxlength="500"/>
       </el-form-item>
-      <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-        <el-select  v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
-          <el-option label="制定" value="制定"></el-option>
-          <el-option label="修订" value="修订"></el-option>
-          <el-option label="完成" value="完成"></el-option>
+      <el-form-item prop="planStatus" label="计划类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+        <el-select  v-model="qbfsForm.planStatus" placeholder="请选择计划类型">
+          <el-option label="未开始" value="未开始"></el-option>
+          <el-option label="制定中" value="制定中"></el-option>
+          <el-option label="修订中" value="修订中"></el-option>
+          <el-option label="已取消" value="已取消"></el-option>
+          <el-option label="已完成" value="已完成"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px"
                     class="add-form-item form-item-disabled">
         <el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
-          <el-option label="制定完成" value="制定完成"></el-option>
-          <el-option label="制定中" value="制定中"></el-option>
-          <el-option label="未制定" value="未制定"></el-option>
+          <el-option label="制定" value="制定"></el-option>
+          <el-option label="修订" value="修订"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="standScope" label="标准范围" style="width: 100%; margin-right:10px"
-                    class="add-form-item form-item-disabled">
-        <el-select v-model="qbfsForm.standScope" placeholder="请选择标准范围">
-          <el-option label="N1" value="N1"></el-option>
-          <el-option label="N2" value="N2"></el-option>
-          <el-option label="N3" value="N3"></el-option>
-          <el-option label="M1" value="M1"></el-option>
-          <el-option label="M2" value="M2"></el-option>
-          <el-option label="M3" value="M3"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="useStand" label="是否采用标准" style="width: 100%; margin-right:10px"
-                    class="add-form-item form-item-disabled">
-        <el-select @change="useStandChange"  v-model="qbfsForm.useStand" placeholder="请选择是否采用标准">
-          <el-option label="是" value="yes"></el-option>
-          <el-option label="否" value="no"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item v-if="!useShow" prop="indexBasis" label="简述指标依据" style="width: 100%; margin-right:10px"
-                    class="add-form-item form-item-disabled">
-        <el-input
-          type="textarea"
-          v-model="qbfsForm.indexBasis"
-          placeholder="请输入指标依据"
-          :maxlength="500"/>
-      </el-form-item>
-<!--      <el-form-item prop="useStand" label="采用何种标准" style="width: 100%; margin-right:10px"-->
-<!--                    class="add-form-item form-item-disabled">-->
-<!--        <el-select v-model="qbfsForm.useStand" placeholder="请选择采用何种标准">-->
-<!--          <el-option-->
-<!--            v-for="item in useOptions"-->
-<!--            :key="item.value"-->
-<!--            :label="item.label"-->
-<!--            :value="item.value">-->
-<!--          </el-option>-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
       <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"
                     class="add-form-item form-item-disabled">
         <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
@@ -110,6 +74,82 @@
                   @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
         </el-input>
       </el-form-item>
+      <el-form-item prop="rqbName" label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+        <el-input
+          style="display: none;"
+          v-model="qbfsForm.rqbJson">
+        </el-input>
+        <el-input
+          clearable
+          v-model="qbfsForm.rqbName"
+          placeholder="请选择企业标准"
+          readonly
+          @click.native="choiceQYBZ">
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="tsJson" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+        <el-input
+          style="display: none;"
+          v-model="qbfsForm.tsJson">
+        </el-input>
+        <el-input
+          clearable
+          v-model="qbfsForm.tsJsonName"
+          placeholder="请选择体系结构"
+          readonly
+          @click.native="choiceTXJG(qbfsForm.tsJson)">
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-select v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+          <el-option
+            v-for="item in BZList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="isRelate" label="是否引用标准" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-select  v-model="qbfsForm.isRelate" placeholder="请选择是否引用标准">
+          <el-option label="是" value="是"></el-option>
+          <el-option label="否" value="否"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="qbfsForm.isRelate === '否'" prop="technologic" label="简述指标依据" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-input
+          type="textarea"
+          v-model="qbfsForm.technologic"
+          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>
+      <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" placeholder="请选择采标程度">
+          <el-option label="等同" value="等同"></el-option>
+          <el-option label="修改" value="修改"></el-option>
+          <el-option label="非等效" value="非等效"></el-option>
+        </el-select>
+      </el-form-item>
+      <template>
+        <custom-input-for-all-standards2
+          class="classDisplay"
+          :config="{attrName: '配套标准'}"
+          :labelWidth="'180px'"
+          v-model="qbfsForm.esMatingRelations"
+        ></custom-input-for-all-standards2>
+      </template>
       <el-form-item label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
         <el-input
           type="textarea"
@@ -117,13 +157,130 @@
           placeholder="请输入新增原因"
           :maxlength="500"/>
       </el-form-item>
-      <!--                                        <el-form-item label="备注" style="width: 100%; margin-right:10px" class="add-form-item" prop="remarks">-->
-      <!--                                            <el-input-->
-      <!--                                                    v-model="qbfsForm.remarks"-->
-      <!--                                                    placeholder="请输入备注"-->
-      <!--                                                    :maxlength="500"/>-->
-      <!--                                        </el-form-item>-->
     </el-form>
+<!--    选择企业标准弹窗-->
+    <el-drawer
+      title="选择企业标准"
+      :visible.sync="QYBZmodal"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="standardForComments">
+        <div class="content" style="height: 100%;">
+          <!-- 顶部工具栏 -->
+          <div class="search-area">
+            <el-form :model="QYBZform" inline class="label-input-form">
+              <el-formItem label="标准号" prop="numberName" class="search-item">
+                <el-input v-model="QYBZform.standCode" clearable placeholder="根据标准号查找" :maxlength="100"/>
+              </el-formItem>
+              <el-formItem label="标准名称" prop="standName" class="search-item">
+                <el-input v-model="QYBZform.standName" clearable placeholder="根据标准名称查找" :maxlength="100"/>
+              </el-formItem>
+              <el-formItem class="search-item btn-box">
+                <el-button
+                  type="primary"
+                  size="mini"
+                  class="common-button-primary"
+                  @click="QYBZget">查询
+                </el-button>
+                <el-button
+                  class="common-button-default"
+                  size="mini"
+                  @click="clearQYBZ">清空
+                </el-button>
+              </el-formItem>
+            </el-form>
+          </div>
+          <div class="table-wrap" style="height: 100%;">
+            <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
+              <el-table
+                ref="selection"
+                :data="QYBZList"
+                tooltip-effect="dark"
+                style="width: 100%;padding:0 0 20px 0;"
+                height="100%"
+                border
+                @selection-change="handleSelectionQYBZ"
+                :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                <el-table-column type="selection" width="55" align="center"/>
+                <el-table-column
+                  label="企标编号"
+                  prop="standCode"
+                >
+                </el-table-column>
+                <el-table-column
+                  show-overflow-tooltip
+                  prop="standName"
+                  label="中文名称"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="issueTime"
+                  label="发布日期"
+                  width="120"
+                >
+                  <template slot-scope="scope">
+                    <span>{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="putTime"
+                  label="实施日期"
+                  sortable
+                  width="120"
+                >
+                  <template slot-scope="scope">
+                    <span>{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="standStatusShow"
+                  label="文本状态"
+                  width="110"
+                >
+                  <template slot-scope="scope">
+                    <span>{{scope.row.standStatusShow}}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+            <pagination :page="QYBZform.page" :total="QYBZform.total" @pageChange="QYBZpageChange" @pageSizeChange="QYBZpageSizeChange"></pagination>
+            <loading :loading="QYBZShow">数据加载中……</loading>
+          </div>
+        </div>
+        <div class="demo-drawer-footer">
+          <el-button size="mini" @click="QYBZcloseDrawer">取消</el-button>
+          <el-button type="primary" size="mini" @click="QYBZenterDrawer">导入</el-button>
+        </div>
+      </div>
+    </el-drawer>
+<!--    选择体系结构弹窗-->
+    <el-drawer
+      title="选择体系结构"
+      :visible.sync="TXJGmodal"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="standardForComments">
+        <div class="content" style="height: 100%;">
+          <el-tree
+            v-if="TXJGmodal"
+            ref="TXJGTree"
+            :data="standSystemOptions"
+            show-checkbox
+            node-key="id"
+            default-expand-all
+            check-strictly
+            :default-checked-keys="TXJGList"
+            :props="defaultProps">
+          </el-tree>
+        </div>
+        <div class="demo-drawer-footer">
+          <el-button size="mini" @click="TXJGcloseDrawer">取消</el-button>
+          <el-button type="primary" size="mini" @click="TXJGenterDrawer">确定</el-button>
+        </div>
+      </div>
+    </el-drawer>
     <!--    多选择责任人-->
     <Role-tree
       :is-title="drawerTitle2"
@@ -150,18 +307,40 @@
 <script>
 import ProcessTitle from "process/components/ProcessTitle";
 import MechanismTree from "@/components/mechanismTree";
-
+import CustomInputForAllStandards from '@/components/CustomFormComponents/InputForAllStandards'
+import CustomInputForAllStandards2 from '@/components/CustomFormComponents/InputForAllStandards2'
 export default {
   name: "establish",
   components: {
     ProcessTitle,
-    MechanismTree
+    MechanismTree,
+    CustomInputForAllStandards,
+    CustomInputForAllStandards2
   },
   props: ['message'],
   data(){
     return {
-      useShow: false,
+      QYBZmodal: false,
+      TXJGmodal: false,
       modalshowflagZRBM: false,
+      QYBZShow: false,
+      defaultProps: {
+        children: 'children',
+        label: 'menuName'
+      },
+      TXJGList: [],
+      QYBZList: [],
+      QYBZformSelect: [],
+      standSystemOptions: [],
+      QYBZform: {
+        page: 1,
+        pageSzie: this.$store.getters.userInfo.configContent,
+        validFlag: '0',
+        userId: this.$store.getters.userInfo.userId,
+        standCode: '',
+        standName: '',
+        total: 0,
+      },
       nodeListZRBM: [],
       drawerTitle2: '',
       drawerTitle: '',
@@ -170,6 +349,7 @@ export default {
       modalshowflag: false,
       nodeList2: [],
       nodeList: [],
+      BZList: [],
       qcdwOptions: [],
       qbfsForm: {
         type: "5",
@@ -178,9 +358,9 @@ export default {
         esName: "", // 企标名称
         planStatus: "", // 计划状态
         reviseStatus: "", // 制修订状态
-        standScope: "", //标准范围
-        useStand: "", //采用何种标准
-        indexBasis: '',  //指标依据
+        area: "", //标准范围
+        isRelate: "", //采用何种标准
+        technologic: '',  //指标依据
         resPerson: "", // 评审责任人
         resPersonName: "",
         wgLeader: "", // 工作组组长
@@ -241,21 +421,15 @@ export default {
         reviseStatus: [
           { required: true, message: "请选择制修订状态", trigger: "blur" }
         ],
-        standScope: [
-          { required: true, message: "请选择标准范围", trigger: "blur" }
-        ],
-        useStand: [
-          { required: true, message: "请选择采用何种标准", trigger: "blur" }
-        ],
-        indexBasis: [
-          { required: true, message: "请输入指标依据", trigger: "blur" }
-        ],
         resPersonName: [
           { required: true, message: "请输入评审责任人", trigger: "blur" }
         ],
         wgLeaderName: [
           { required: true, message: "请输入工作组组长", trigger: "blur" }
         ],
+        unitName: [
+          { required: true, message: "请选择起草责任单位", trigger: "blur" }
+        ],
         draftTime: [
           { required: true, message: "请输入计划标准初稿完成时间", trigger: "blur" }
         ],
@@ -289,13 +463,91 @@ export default {
      this.$http.get('sys/dictype/getDicTypeListCode', '',{
        _this: this
      }, res => {
-       console.log(res);
+       this.BZList = res.data.ENERGYTYPES //标准范围
+       this.standSystemOptions = res.data.TXLBBUSS // 体系结构
        this.qcdwOptions = res.data.QCDW // 起草单位
      })
   },
   methods: {
-    useStandChange(){
-       this.useShow = !this.useShow
+    TXJGcloseDrawer () {
+      this.TXJGmodal = false
+    },
+    TXJGenterDrawer () {
+      let list = this.$refs.TXJGTree.getCheckedNodes()
+      let id = ''
+      let name = ''
+      list.map(item => {
+        if (id.length > 0) {
+          id += ','
+          id += item.id
+          name += ','
+          name += item.menuName
+        } else {
+          id = item.id
+          name = item.menuName
+        }
+      })
+      this.qbfsForm.tsJson = id
+      this.qbfsForm.tsJsonName = name
+      this.TXJGmodal = false
+    },
+    //选择体系结构
+    choiceTXJG (id) {
+      if (id) {
+        this.TXJGList = id.split(',')
+      } else {
+        this.TXJGList = []
+      }
+      this.TXJGmodal = true
+    },
+    //选择企业标准
+    choiceQYBZ(){
+      this.QYBZformSelect = []
+      this.QYBZget()
+      this.QYBZmodal = true
+    },
+    QYBZcloseDrawer () {
+      this.clearQYBZ()
+    },
+    QYBZenterDrawer () {
+      if (this.QYBZformSelect.length > 1) {
+        this.$message.warning('请选择一条标准')
+      } else if (this.QYBZformSelect.length < 1){
+        this.$message.warning('请选择要带入的标准')
+      } else {
+        this.qbfsForm.rqbJson = this.QYBZformSelect[0].id
+        this.qbfsForm.rqbName = this.QYBZformSelect[0].standName
+        this.clearQYBZ()
+        this.QYBZmodal = false
+      }
+    },
+    handleSelectionQYBZ  (val) {
+      this.QYBZformSelect = val
+    },
+    QYBZpageChange (page) {
+      this.QYBZform.page = page
+      this.QYBZget()
+    },
+    QYBZpageSizeChange (pageSize) {
+      this.QYBZform.pageSize = pageSize
+      this.QYBZget()
+    },
+    QYBZget () {
+      this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
+        _this: this, loading: 'QYBZShow'
+      }, res => {
+        this.QYBZList = res.data.list
+        this.QYBZform.total = res.data.count
+      }, e => {
+      })
+    },
+    clearQYBZ () {
+      this.QYBZform = {
+        page: 1,
+        standCode: '',
+        standName: '',
+      }
+      this.QYBZget()
     },
     choiceZRBM(type, title, id) {
       this.nodeListZRBM = []
@@ -390,6 +642,88 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/mixins';
+@import '~@/assets/styles/style';
+#establish {
+  height: 100%;
+  background: #fff;
+  .classDisplay {
+    /deep/.el-form-item__content {
+      width: calc(~'100% - 180px');
+      .el-input__inner {
+        width: calc(~'100% - 80px');
+      }
+    }
+  }
+  .standardForComments {
+    height: calc(~'100% - 56px');
+    background: #fff;
+    flex-direction: column;
+    .action-bar {
+      margin-bottom: 5px;
+      padding: 0;
+    }
 
+    .content {
+      flex: auto;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+
+      .table-wrap {
+        flex: auto;
+        overflow: hidden;
+        position: relative;
+      }
+    }
+
+    & > .pagination {
+      position: static;
+
+      /deep/ .pagination-slot {
+        padding: 0;
+      }
+    }
+  }
+  /deep/.table-wrap {
+    .el-table__fixed {
+      height: calc(~'100% - 20px') !important;
+    }
+  }
+  .add-form-item {
+    /deep/.el-form-item__content {
+      width: calc(~'100% - 180px');
+      height: 50px;
+    }
+  }
+  display: flex;
+  flex-direction: column;
+  .content-center {
+    padding: 10px;
+  }
+  .container {
+    flex: 1;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    .table-wrap {
+      flex: 1;
+      overflow: hidden;
+      position: relative;
+      .inner-wrap {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .footer {
+      /deep/ .pagination {
+        position: static;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index 23973cf52..c57d0d1d7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -86,16 +86,45 @@
               <el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
                         @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
               </el-input>
-<!--              <el-select v-model="qbfsForm.unit" filterable multiple  clearable>-->
-<!--                <el-option-->
-<!--                  v-for="item in qcdwOptions"-->
-<!--                  placeholder="请选择起草责任单位"-->
-<!--                  :key="item.value"-->
-<!--                  :value="item.label"-->
-<!--                  :label="item.label"-->
-<!--                ></el-option>-->
-<!--              </el-select>-->
             </el-form-item>
+            <el-form-item prop="rqbName" label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-input
+                style="display: none;"
+                v-model="qbfsForm.rqbJson">
+              </el-input>
+              <el-input
+                clearable
+                v-model="qbfsForm.rqbName"
+                placeholder="请选择企业标准"
+                readonly
+                @click.native="choiceQYBZ">
+              </el-input>
+            </el-form-item>
+            <template>
+              <custom-input-for-all-standards2
+                class="classDisplay"
+                :config="{attrName: '配套标准'}"
+                :labelWidth="'180px'"
+                v-model="qbfsForm.esMatingRelations"
+              ></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" placeholder="请选择采标程度">
+                <el-option label="等同" value="等同"></el-option>
+                <el-option label="修改" value="修改"></el-option>
+                <el-option label="非等效" value="非等效"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="qbfsForm.isRelate === '否'" prop="technologic" label="简述指标依据" style="width: 100%; margin-right:10px"
+                          class="add-form-item form-item-disabled">
+              <el-input
+                type="textarea"
+                v-model="qbfsForm.technologic"
+                placeholder="请输入指标依据"
+                :maxlength="500"/>
+            </el-form-item>
+
           </el-col>
           <el-col :span="12">
             <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
@@ -124,6 +153,34 @@
                 placeholder="请选择标准发布时间">
               </el-date-picker>
             </el-form-item>
+            <el-form-item prop="tsJson" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-input
+                style="display: none;"
+                v-model="qbfsForm.tsJson">
+              </el-input>
+              <el-input
+                clearable
+                v-model="qbfsForm.tsJsonName"
+                placeholder="请选择体系结构"
+                readonly
+                @click.native="choiceTXJG(qbfsForm.tsJson)">
+              </el-input>
+            </el-form-item>
+            <el-form-item prop="isRelate" label="是否引用标准" style="width: 100%; margin-right:10px"
+                          class="add-form-item form-item-disabled">
+              <el-select  v-model="qbfsForm.isRelate" placeholder="请选择是否引用标准">
+                <el-option label="是" value="是"></el-option>
+                <el-option label="否" value="否"></el-option>
+              </el-select>
+            </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>
             <el-form-item label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
               <el-input
                 type="textarea"
@@ -268,6 +325,129 @@
         <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
       </div>
     </el-drawer>
+    <!--    选择企业标准弹窗-->
+    <el-drawer
+      title="选择企业标准"
+      :visible.sync="QYBZmodal"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="standardForComments">
+        <div class="content" style="height: 100%;">
+          <!-- 顶部工具栏 -->
+          <div class="search-area">
+            <el-form :model="QYBZform" inline class="label-input-form">
+              <el-formItem label="标准号" prop="numberName" class="search-item">
+                <el-input v-model="QYBZform.standCode" clearable placeholder="根据标准号查找" :maxlength="100"/>
+              </el-formItem>
+              <el-formItem label="标准名称" prop="standName" class="search-item">
+                <el-input v-model="QYBZform.standName" clearable placeholder="根据标准名称查找" :maxlength="100"/>
+              </el-formItem>
+              <el-formItem class="search-item btn-box">
+                <el-button
+                  type="primary"
+                  size="mini"
+                  class="common-button-primary"
+                  @click="QYBZget">查询
+                </el-button>
+                <el-button
+                  class="common-button-default"
+                  size="mini"
+                  @click="clearQYBZ">清空
+                </el-button>
+              </el-formItem>
+            </el-form>
+          </div>
+          <div class="table-wrap" style="height: 100%;">
+            <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
+              <el-table
+                ref="selection"
+                :data="QYBZList"
+                tooltip-effect="dark"
+                style="width: 100%;padding:0 0 20px 0;"
+                height="100%"
+                border
+                @selection-change="handleSelectionQYBZ"
+                :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                <el-table-column type="selection" width="55" align="center"/>
+                <el-table-column
+                  label="企标编号"
+                  prop="standCode"
+                >
+                </el-table-column>
+                <el-table-column
+                  show-overflow-tooltip
+                  prop="standName"
+                  label="中文名称"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="issueTime"
+                  label="发布日期"
+                  width="120"
+                >
+                  <template slot-scope="scope">
+                    <span>{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="putTime"
+                  label="实施日期"
+                  sortable
+                  width="120"
+                >
+                  <template slot-scope="scope">
+                    <span>{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="standStatusShow"
+                  label="文本状态"
+                  width="110"
+                >
+                  <template slot-scope="scope">
+                    <span>{{scope.row.standStatusShow}}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+            <pagination :page="QYBZform.page" :total="QYBZform.total" @pageChange="QYBZpageChange" @pageSizeChange="QYBZpageSizeChange"></pagination>
+            <loading :loading="QYBZShow">数据加载中……</loading>
+          </div>
+        </div>
+        <div class="demo-drawer-footer">
+          <el-button size="mini" @click="QYBZcloseDrawer">取消</el-button>
+          <el-button type="primary" size="mini" @click="QYBZenterDrawer">导入</el-button>
+        </div>
+      </div>
+    </el-drawer>
+    <!--    选择体系结构弹窗-->
+    <el-drawer
+      title="选择体系结构"
+      :visible.sync="TXJGmodal"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="standardForComments">
+        <div class="content" style="height: 100%;">
+          <el-tree
+            v-if="TXJGmodal"
+            ref="TXJGTree"
+            :data="standSystemOptions"
+            show-checkbox
+            node-key="id"
+            default-expand-all
+            check-strictly
+            :default-checked-keys="TXJGList"
+            :props="defaultProps">
+          </el-tree>
+        </div>
+        <div class="demo-drawer-footer">
+          <el-button size="mini" @click="TXJGcloseDrawer">取消</el-button>
+          <el-button type="primary" size="mini" @click="TXJGenterDrawer">确定</el-button>
+        </div>
+      </div>
+    </el-drawer>
     <!--    多选择责任人-->
     <Role-tree
       :is-title="drawerTitle2"
@@ -294,16 +474,40 @@
 <script>
 import ProcessTitle from "process/components/ProcessTitle";
 import MechanismTree from '@/components/mechanismTree'
+import CustomInputForAllStandards from "@/components/CustomFormComponents/InputForAllStandards";
+import CustomInputForAllStandards2 from "@/components/CustomFormComponents/InputForAllStandards2";
 
 export default {
   name: "merge",
   components: {
     ProcessTitle,
-    MechanismTree
+    MechanismTree,
+    CustomInputForAllStandards,
+    CustomInputForAllStandards2
   },
   props: ['message'],
   data(){
     return {
+      QYBZmodal: false,
+      TXJGmodal: false,
+      QYBZShow: false,
+      defaultProps: {
+        children: 'children',
+        label: 'menuName'
+      },
+      TXJGList: [],
+      QYBZList: [],
+      QYBZformSelect: [],
+      standSystemOptions: [],
+      QYBZform: {
+        page: 1,
+        pageSzie: this.$store.getters.userInfo.configContent,
+        validFlag: '0',
+        userId: this.$store.getters.userInfo.userId,
+        standCode: '',
+        standName: '',
+        total: 0,
+      },
       modalshowflagZRBM: false,
       nodeListZRBM: [],
       drawerTitle2: '',
@@ -411,7 +615,8 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
     }, res => {
-      console.log(res);
+      this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSystemOptions = res.data.TXLBBUSS // 体系结构
       this.qcdwOptions = res.data.QCDW // 起草单位
     })
     this.getStandDataBtn()
@@ -427,6 +632,86 @@ export default {
     }
   },
   methods: {
+    TXJGcloseDrawer () {
+      this.TXJGmodal = false
+    },
+    TXJGenterDrawer () {
+      let list = this.$refs.TXJGTree.getCheckedNodes()
+      let id = ''
+      let name = ''
+      list.map(item => {
+        if (id.length > 0) {
+          id += ','
+          id += item.id
+          name += ','
+          name += item.menuName
+        } else {
+          id = item.id
+          name = item.menuName
+        }
+      })
+      this.qbfsForm.tsJson = id
+      this.qbfsForm.tsJsonName = name
+      this.TXJGmodal = false
+    },
+    //选择体系结构
+    choiceTXJG (id) {
+      if (id) {
+        this.TXJGList = id.split(',')
+      } else {
+        this.TXJGList = []
+      }
+      this.TXJGmodal = true
+    },
+    //选择企业标准
+    choiceQYBZ(){
+      this.QYBZformSelect = []
+      this.QYBZget()
+      this.QYBZmodal = true
+    },
+    QYBZcloseDrawer () {
+      this.clearQYBZ()
+    },
+    QYBZenterDrawer () {
+      if (this.QYBZformSelect.length > 1) {
+        this.$message.warning('请选择一条标准')
+      } else if (this.QYBZformSelect.length < 1){
+        this.$message.warning('请选择要带入的标准')
+      } else {
+        this.qbfsForm.rqbJson = this.QYBZformSelect[0].id
+        this.qbfsForm.rqbName = this.QYBZformSelect[0].standName
+        this.clearQYBZ()
+        this.QYBZmodal = false
+      }
+    },
+    handleSelectionQYBZ  (val) {
+      this.QYBZformSelect = val
+    },
+    QYBZpageChange (page) {
+      this.QYBZform.page = page
+      this.QYBZget()
+    },
+    QYBZpageSizeChange (pageSize) {
+      this.QYBZform.pageSize = pageSize
+      this.QYBZget()
+    },
+    QYBZget () {
+      this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
+        _this: this, loading: 'QYBZShow'
+      }, res => {
+        this.QYBZList = res.data.list
+        this.QYBZform.total = res.data.count
+      }, e => {
+      })
+    },
+    clearQYBZ () {
+      this.QYBZform = {
+        page: 1,
+        standCode: '',
+        standName: '',
+      }
+      this.QYBZget()
+    },
     choiceZRBM(type, title, id) {
       this.nodeListZRBM = []
       this.nodeListZRBM.push(id)
@@ -601,7 +886,87 @@ export default {
 </script>
 
 <style lang="less" scoped>
+@import '~@/assets/styles/mixins';
+@import '~@/assets/styles/style';
 .merge {
+  height: 100%;
+  background: #fff;
+  .classDisplay {
+    /deep/.el-form-item__content {
+      width: calc(~'100% - 180px');
+      .el-input__inner {
+        width: calc(~'100% - 80px');
+      }
+    }
+  }
+  .standardForComments {
+    height: calc(~'100% - 56px');
+    background: #fff;
+    flex-direction: column;
+    .action-bar {
+      margin-bottom: 5px;
+      padding: 0;
+    }
 
+    .content {
+      flex: auto;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+
+      .table-wrap {
+        flex: auto;
+        overflow: hidden;
+        position: relative;
+      }
+    }
+
+    & > .pagination {
+      position: static;
+
+      /deep/ .pagination-slot {
+        padding: 0;
+      }
+    }
+  }
+  /deep/.table-wrap {
+    .el-table__fixed {
+      height: calc(~'100% - 20px') !important;
+    }
+  }
+  .add-form-item {
+    /deep/.el-form-item__content {
+      width: calc(~'100% - 180px');
+      height: 50px;
+    }
+  }
+  display: flex;
+  flex-direction: column;
+  .content-center {
+    padding: 10px;
+  }
+  .container {
+    flex: 1;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    .table-wrap {
+      flex: 1;
+      overflow: hidden;
+      position: relative;
+      .inner-wrap {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .footer {
+      /deep/ .pagination {
+        position: static;
+      }
+    }
+  }
 }
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
index 97a49d619..8fe1d1227 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
@@ -54,6 +54,27 @@
                 placeholder="请选择初稿完成时间">
               </el-date-picker>
             </el-form-item>
+            <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+              <el-input
+                disabled
+                v-model="qbfsForm.rqbName"
+                placeholder="请输入企业标准"
+                :maxlength="500"/>
+            </el-form-item>
+            <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
+              <el-input
+                disabled
+                v-model="qbfsForm.tsJsonName"
+                placeholder="请输入体系结构"
+                :maxlength="500"/>
+            </el-form-item>
+            <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+              <el-input
+                disabled
+                v-model="qbfsForm.esMatingRelations"
+                placeholder="请输入配套标准"
+                :maxlength="500"/>
+            </el-form-item>
             <el-form-item label="更名后企标名称" prop="renameEs" class="add-form-item form-item-disabled">
               <el-input
                 v-model="qbfsForm.renameEs"
@@ -115,6 +136,45 @@
                 ></el-input>
               </div>
             </el-form-item>
+            <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                          class="add-form-item form-item-disabled">
+              <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+                <el-option
+                  v-for="item in BZList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+              <el-input
+                disabled
+                v-model="qbfsForm.isRelate"
+                placeholder="请输入是否引用标准"
+                :maxlength="500"/>
+            </el-form-item>
+            <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
+              <el-input
+                disabled
+                v-model="qbfsForm.technologic"
+                placeholder="请输入是否引用标准"
+                :maxlength="500"/>
+            </el-form-item>
+            <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
+              <el-input
+                disabled
+                v-model="qbfsForm.esStandRelations"
+                placeholder="请输入采用标准"
+                :maxlength="500"/>
+            </el-form-item>
+            <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+              <el-input
+                disabled
+                v-model="qbfsForm.useLevel"
+                placeholder="请输入采标程度"
+                :maxlength="500"/>
+            </el-form-item>
             <el-form-item label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
               <el-input
                 type="textarea"
@@ -284,6 +344,7 @@ export default {
       },
       ListModel: false,
       standinfoList: [],
+      BZList: [],
       page: 1,
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
@@ -320,6 +381,11 @@ export default {
     if(!this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods: {
     validateForm () {
@@ -381,6 +447,16 @@ export default {
         this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
         this.qbfsForm.unitName = this.selectList[0].unitName
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
+        if(this.selectList[0].area){
+          this.qbfsForm.area = this.selectList[0].area.split(',')
+        }
+        this.qbfsForm.rqbName = this.selectList[0].rqbName
+        this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
+        this.qbfsForm.isRelate = this.selectList[0].isRelate
+        this.qbfsForm.useLevel = this.selectList[0].useLevel
+        this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
+        this.qbfsForm.technologic = this.selectList[0].technologic
+        this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
         this.ListModel = false
       }
     },
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
index 7ac67bbd9..dbde6d77d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
@@ -82,6 +82,66 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入企业标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.tsJsonName"
+              placeholder="请输入体系结构"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                        class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+              <el-option
+                v-for="item in BZList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.isRelate"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.technologic"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esStandRelations"
+              placeholder="请输入采用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.useLevel"
+              placeholder="请输入采标程度"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esMatingRelations"
+              placeholder="请输入配套标准"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
@@ -169,7 +229,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
@@ -234,6 +294,19 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
+<!--    <ProcessFooter-->
+<!--      show-back-->
+<!--      show-transfer-->
+<!--      show-submit-->
+<!--      :transfer-loading="isTransfer"-->
+<!--      :submitLoading="isSubmit"-->
+<!--      :saveLoading="saveLoading"-->
+<!--      :approval="true"-->
+<!--      @back="beforeBack"-->
+<!--      @transfer="handleTransfer"-->
+<!--      @submit="handleSubmit"-->
+<!--    >-->
+<!--    </ProcessFooter>-->
     <!-- 福田全公司选人解决方案 -->
     <Role-tree
       check-box
@@ -261,6 +334,7 @@ export default {
   },
   data(){
     return {
+      BZList: [],
       active: '1',
       type: '',
       commentText: '',
@@ -280,6 +354,12 @@ export default {
   mounted() {
     this.processTable()
     this.getData()
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods:{
     processTable() {
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
index a7f8c1792..c0f297174 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -439,25 +439,6 @@ export default {
         this.saveLoading = false
       })
     },
-    // repeatName(){
-    //   let qbzxdFrom = this.$refs["childForm"].qbfsForm;
-    //   this.$http.get('esRevisePlan/es-revise-plan/getDataByName', {esName: qbzxdFrom.esName, id : qbzxdFrom.esId}, {
-    //     _this: this
-    //   }, res => {
-    //     if(qbzxdFrom.type === '1'){
-    //       let dataList = res.data
-    //       dataList.forEach(item => {
-    //         if(item.esName === qbzxdFrom.esName1 || item.esName === qbzxdFrom.esName2){
-    //           this.comFlag = 1
-    //         }
-    //       })
-    //     }else if(qbzxdFrom.type === '5'){
-    //       if(!res.data.length){
-    //         this.comFlag = 1
-    //       }
-    //     }
-    //   })
-    // },
     //流程提交
     handleSubmit() {
       if(!this.$refs["childForm"].qbfsForm.type){
@@ -474,6 +455,7 @@ export default {
                 if (valid) {
                   this.isSubmit = true;
                   let json = Object.assign(qbzxdFrom, this.roleForm);
+                  console.log(json);
                   this.$http.post("lawss/activiti/startProcessRollBack", {
                     createUser: this.$store.getters.userInfo.userId,
                     createUserName: this.$store.getters.userInfo.userName,
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
index 5be9a3a1f..61f5b6413 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
@@ -82,6 +82,66 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入企业标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.tsJsonName"
+              placeholder="请输入体系结构"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                        class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+              <el-option
+                v-for="item in BZList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.isRelate"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.technologic"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esStandRelations"
+              placeholder="请输入采用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.useLevel"
+              placeholder="请输入采标程度"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esMatingRelations"
+              placeholder="请输入配套标准"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
@@ -274,6 +334,7 @@ export default {
   },
   data(){
     return {
+      BZList: [],
       active: '1',
       type: '',
       commentText: '',
@@ -293,6 +354,12 @@ export default {
   mounted() {
     this.processTable()
     this.getData()
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods:{
     processTable() {
@@ -329,6 +396,7 @@ export default {
       console.log(item);
       this.$nextTick(() => {
         this.qbfsForm = JSON.parse(JSON.stringify(item))
+        console.log(item.area.join(','));
         this.type = item.type
       })
     },
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
index 94cd454fb..b9b2737fc 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
@@ -82,6 +82,66 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入企业标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.tsJsonName"
+              placeholder="请输入体系结构"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                        class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+              <el-option
+                v-for="item in BZList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.isRelate"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.technologic"
+              placeholder="请输入简述指标依据"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esStandRelations"
+              placeholder="请输入采用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.useLevel"
+              placeholder="请输入采标程度"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esMatingRelations"
+              placeholder="请输入配套标准"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
@@ -272,6 +332,7 @@ export default {
   },
   data(){
     return {
+      BZList: [],
       active: '1',
       type: '',
       commentText: '',
@@ -291,6 +352,12 @@ export default {
   mounted() {
     this.processTable()
     this.getData()
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods:{
     processTable() {
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
index 944f67249..1129be8e7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
@@ -82,6 +82,66 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入企业标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.tsJsonName"
+              placeholder="请输入体系结构"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                        class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+              <el-option
+                v-for="item in BZList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.isRelate"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.technologic"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esStandRelations"
+              placeholder="请输入采用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.useLevel"
+              placeholder="请输入采标程度"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esMatingRelations"
+              placeholder="请输入配套标准"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
@@ -274,6 +334,7 @@ export default {
   },
   data(){
     return {
+      BZList: [],
       active: '1',
       type: '',
       commentText: '',
@@ -293,6 +354,12 @@ export default {
   mounted() {
     this.processTable()
     this.getData()
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods:{
     processTable() {
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
index 6978aa1c0..936a1db64 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
@@ -82,6 +82,66 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入企业标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.tsJsonName"
+              placeholder="请输入体系结构"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                        class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+              <el-option
+                v-for="item in BZList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.isRelate"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.technologic"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esStandRelations"
+              placeholder="请输入采用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.useLevel"
+              placeholder="请输入采标程度"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esMatingRelations"
+              placeholder="请输入配套标准"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
@@ -274,6 +334,7 @@ export default {
   },
   data(){
     return {
+      BZList: [],
       active: '1',
       type: '',
       commentText: '',
@@ -293,6 +354,12 @@ export default {
   mounted() {
     this.processTable()
     this.getData()
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods:{
     processTable() {

From eec172188565387327e6d14f38f0f7358faa1112 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Wed, 29 Dec 2021 14:11:49 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standCalendar/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue
index a00639dc4..738fc2820 100644
--- a/src/pages/localTool/standCalendar/index.vue
+++ b/src/pages/localTool/standCalendar/index.vue
@@ -174,7 +174,7 @@
               </el-table-column>
             </el-table>
           </el-form-item>
-          <el-form-item class="picker_style" style="margin-bottom: 0;min-height: 50px;line-height: 50px;border-bottom: 1px dashed #e5e5e5;" label="会议时间:">
+          <el-form-item class="picker_style" label="会议时间:">
             <el-date-picker
               v-model="editMeetForm.date"
               type="datetime"
@@ -341,7 +341,7 @@ export default {
       deleteTable: [],
       loading: false,
       dialogTitle: '',
-
+      // 当前日期之前不可选择
       datePicker: {
         disabledDate(date) {
           return date.getTime() <  Date.now() - 24 * 60 * 60 * 1000
@@ -829,6 +829,7 @@ export default {
   .content_form {
     /deep/.el-input--suffix .el-input__inner {
       border: 0;
+      color: #828387;
     }
     label-input-form {
       .picker_style {

From 3cbd04113b1a350ca27984a05ed08ff929557d18 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 29 Dec 2021 14:20:20 +0800
Subject: [PATCH 12/15] feat: There is no way the,buss plan

---
 .../enterpriseStandardPlan/index.vue           | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index ef5a30c9e..5f11c8896 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -5,16 +5,16 @@
                 <el-form :modal="form" inline class="label-input-form">
                     <el-form-item label="计划状态" class="search-item">
                         <el-select v-model="form.planStatus" placeholder="请选择计划状态">
-                            <el-option label="制定" value="制定"></el-option>
-                            <el-option label="修订" value="修订"></el-option>
-                            <el-option label="完成" value="完成"></el-option>
+                            <el-option label="制定" value="2"></el-option>
+                            <el-option label="修订" value="1"></el-option>
+                            <el-option label="完成" value="0"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="制修订状态" class="search-item">
                         <el-select v-model="form.reviseStatus" placeholder="请选择制修订状态">
-                            <el-option label="制定完成" value="制定完成"></el-option>
-                            <el-option label="制定中" value="制定中"></el-option>
-                            <el-option label="未制定" value="未制定"></el-option>
+                            <el-option label="制定完成" value="0"></el-option>
+                            <el-option label="制定中" value="1"></el-option>
+                            <el-option label="未制定" value="2"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="企标名称" class="search-item">
@@ -116,9 +116,9 @@
                                 width="150"
                                 align="center"
                                 label="制修订状态">
-<!--                            <template slot-scope="scope">-->
-<!--                                <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>-->
-<!--                            </template>-->
+                            <template slot-scope="scope">
+                            <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                        </template>
                         </el-table-column>
                         <el-table-column
                                 prop="drafterName"

From b3aae436124ed70acd8f3a2729deb7871a001403 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Wed, 29 Dec 2021 14:49:35 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E9=80=82=E7=94=A8=E8=BD=A6=E5=9E=8B?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue                | 3 ++-
 .../foreignStandardsAndRegulations/index.vue                 | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 0043f6bc0..84d5db3ed 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1672,7 +1672,7 @@
                     <custom-select-array
                         style="margin-left: -14px"
                         :config="applyArcticOptions"
-                        v-model="sarStandardsSearch['applyArctic']"
+                        v-model="sarStandardsSearch['CLLX']"
                     ></custom-select-array>
                   </template>
 <!--                  <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">-->
@@ -2305,6 +2305,7 @@ export default {
         standNature: '',//标准性质
         textStatus: '',//文本状态
         synopsis: '', // 内容摘要
+        CLLX: '' // 适用车型
 
 
       }, // 分页查询过程中用到的对象
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index f897487fb..665448eeb 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -619,7 +619,7 @@
                     <custom-select-array
                         :config="applyArcticOptions"
                         style="margin-left: -14px"
-                        v-model="sarStandardsSearch['applyArctic']"
+                        v-model="sarStandardsSearch['CLLX']"
                     ></custom-select-array>
                   </template>
 <!--                  <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">
@@ -1850,7 +1850,8 @@ export default {
         standState: '',
         standNature: '',//标准性质
         synopsis: '', // 内容摘要
-        textStatus: ''//文本状态
+        textStatus: '',//文本状态
+        CLLX: ''
       },
       //高级搜索映射
       advanceSearchMapping: {

From 768e2b33d4045060da8740695a2b9a1ab47fe84d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 29 Dec 2021 14:58:46 +0800
Subject: [PATCH 14/15] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/phone/qbzxdjhgk/step2.vue           | 67 ++++++++++++++++++
 .../pages/phone/qbzxdjhgk/step3.vue           | 68 ++++++++++++++++++-
 .../pages/phone/qbzxdjhgk/step4.vue           | 68 ++++++++++++++++++-
 .../pages/phone/qbzxdjhgk/step5.vue           | 68 ++++++++++++++++++-
 4 files changed, 268 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue
index c93936f7f..207ebc5fd 100644
--- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue
+++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue
@@ -83,6 +83,66 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入企业标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.tsJsonName"
+              placeholder="请输入体系结构"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                        class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+              <el-option
+                v-for="item in BZList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.isRelate"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.technologic"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esStandRelations"
+              placeholder="请输入采用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.useLevel"
+              placeholder="请输入采标程度"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esMatingRelations"
+              placeholder="请输入配套标准"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
@@ -235,12 +295,19 @@ export default {
       nodeList:[],
       drawerTitle: '',
       detailData: [],
+      BZList: [],
 
     }
   },
   mounted() {
     this.processTable()
     this.getData()
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods:{
     processTable() {
diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue
index 08c28cfb4..250b8a677 100644
--- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue
+++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue
@@ -83,6 +83,66 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入企业标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.tsJsonName"
+              placeholder="请输入体系结构"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                        class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+              <el-option
+                v-for="item in BZList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.isRelate"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.technologic"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esStandRelations"
+              placeholder="请输入采用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.useLevel"
+              placeholder="请输入采标程度"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esMatingRelations"
+              placeholder="请输入配套标准"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
@@ -228,12 +288,18 @@ export default {
       nodeList:[],
       drawerTitle: '',
       detailData: [],
-
+      BZList: [],
     }
   },
   mounted() {
     this.processTable()
     this.getData()
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods:{
     processTable() {
diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue
index 825303085..87c4ed9cd 100644
--- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue
+++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue
@@ -83,6 +83,66 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入企业标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.tsJsonName"
+              placeholder="请输入体系结构"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                        class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+              <el-option
+                v-for="item in BZList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.isRelate"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.technologic"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esStandRelations"
+              placeholder="请输入采用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.useLevel"
+              placeholder="请输入采标程度"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esMatingRelations"
+              placeholder="请输入配套标准"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
@@ -228,12 +288,18 @@ export default {
       nodeList:[],
       drawerTitle: '',
       detailData: [],
-
+      BZList: [],
     }
   },
   mounted() {
     this.processTable()
     this.getData()
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods:{
     processTable() {
diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue
index dd44e41c5..d3de1e41b 100644
--- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue
+++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue
@@ -83,6 +83,66 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入企业标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.tsJsonName"
+              placeholder="请输入体系结构"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                        class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+              <el-option
+                v-for="item in BZList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.isRelate"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.technologic"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esStandRelations"
+              placeholder="请输入采用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.useLevel"
+              placeholder="请输入采标程度"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esMatingRelations"
+              placeholder="请输入配套标准"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
@@ -228,12 +288,18 @@ export default {
       nodeList:[],
       drawerTitle: '',
       detailData: [],
-
+      BZList: [],
     }
   },
   mounted() {
     this.processTable()
     this.getData()
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods:{
     processTable() {

From 042bacbaa9d0c2e535d21271a3db429cec0fc744 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 29 Dec 2021 15:04:04 +0800
Subject: [PATCH 15/15] feat: There is no way the,buss plan add bussSort

---
 src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 5f11c8896..e1cefc37b 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -203,7 +203,7 @@
                                 <el-col :span="24">
                                     <el-form :model="addForm" inline class="label-input-form" label-width="180px"  :rules="addFormRules" ref="addForm">
                                         <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-                                            <el-select v-model="addForm.bussSort" filterable clearable placeholder="" style="appearance: none">
+                                            <el-select v-model="addForm.bussSort" filterable clearable placeholder="" style="appearance: none" placeholder="请选择企标类别">
                                                 <el-option
                                                         v-for="item in standSortOptions"
                                                         :key="item.value"