Merge branch 'develop' into FOTON

src/components/CustomFormComponents/InputForStandards.vue

@@ -57,7 +57,7 @@
               <el-button
                 type="primary"
                 class="common-button-primary"
-                round
+                size="mini"
                 @click="getReplaceLawsNumRowFirst(true)">
                 查询
               </el-button>
@@ -65,8 +65,7 @@
             <el-form-item class="search-item btn-box">
               <el-button
                 class="common-button-default"
-                icon="el-icon-refresh-left"
+                size="mini"
-                round
                 type="default"
                 @click="getResetLawsNumRow">
                 清空
@@ -99,6 +98,7 @@
         </el-table-column>
         <el-table-column
           prop="standName"
+          min-width="300"
           label="标准名称">
         </el-table-column>
         <el-table-column
@@ -125,8 +125,8 @@
         @pageChange="pageChangeReplace"
         @pageSizeChange="pageSizeChangeReplace"></pagination>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
-        <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
+        <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
       </div>
     </el-dialog>
 
@@ -398,6 +398,9 @@ export default {
 </script>
 
 <style scoped lang="less">
+/deep/.el-dialog__body{
+  padding: 15px 20px;
+}
 .add-form-item{
   /deep/.el-form-item__content{
     .el-textarea{

src/components/CustomFormComponents/InputForStandardsForForeign.vue

@@ -9,11 +9,14 @@
       :class="{'form-item-disabled': disabled}"
     >
       <el-input
-        :value="value"
+          :value="value"
-        :placeholder="placeholder"
+          :placeholder="placeholder"
-        :disabled="disabled"
+          :disabled="disabled"
-        clearable
+          clearable
-        @input="handleChange"
+          type="textarea"
+          resize="none"
+          :autosize="true"
+          @input="handleChange"
       ></el-input>
       <el-button
         type="primary"
@@ -50,8 +53,8 @@
             <el-form-item class="search-item btn-box">
               <el-button
                 type="primary"
+                size="mini"
                 class="common-button-primary"
-                round
                 @click="getReplaceLawsNumRow(true)">
                 查询
               </el-button>
@@ -59,8 +62,8 @@
             <el-form-item class="search-item btn-box">
               <el-button
                 class="common-button-default"
-                round
                 type="default"
+                size="mini"
                 @click="getResetLawsNumRow">
                 清空
               </el-button>
@@ -94,7 +97,7 @@
         <el-table-column
           prop="standName"
           label="标准名称"
-          width="130">
+          min-width="300" >
         </el-table-column>
         <el-table-column
           prop="issueTime"
@@ -132,8 +135,8 @@
         @pageChange="pageChangeReplace"
         @pageSizeChange="pageSizeChangeReplace"></pagination>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
-        <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
+        <el-button type="primary"  size="mini" class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
       </div>
     </el-dialog>
 
@@ -371,6 +374,16 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="less"  scoped>
+.add-form-item{
+/deep/.el-form-item__content{
+.el-textarea{
+  width: calc(~'100% - 90px');
+}
+}
+}
+/deep/.el-dialog__body{
+  padding: 15px 20px;
+}
 
 </style>

src/pages/details/complianceDetails/index.vue

@@ -16,6 +16,7 @@
         <el-table-column
           prop="standNumber"
           label="标准号/条款号"
+          width="160"
           align="center"
         >
         </el-table-column>
@@ -34,6 +35,7 @@
         <el-table-column
           prop="researchCompletionTime"
           label="完成时间"
+          width="160"
           align="center"
         >
           <template slot-scope="scope">
@@ -43,12 +45,14 @@
         <el-table-column
           prop="evaluationPeople"
           label="评估人"
+          width="160"
           align="center"
         >
         </el-table-column>
         <el-table-column
           prop="evaluationTime"
           label="评估时间"
+          width="160"
           align="center"
         >
           <template slot-scope="scope">
@@ -73,6 +77,7 @@
          <el-table-column
            prop="standNumber"
            label="标准号/条款号"
+           width="160"
            align="center"
          >
          </el-table-column>
@@ -85,12 +90,14 @@
          <el-table-column
            prop="evaluationPeople"
            label="评估人"
+           width="160"
            align="center"
          >
          </el-table-column>
          <el-table-column
            prop="evaluationTime"
            label="评估时间"
+           width="160"
            align="center"
          >
            <template slot-scope="scope">

src/pages/details/otherStandardDetails/index.vue

@@ -672,7 +672,6 @@
           <el-table-column
               type="selection"
               fixed="left"
-              align="center"
               width="60"
           >
           </el-table-column>
@@ -682,18 +681,19 @@
               prop="itemsNum"
               width="90"
               label="条款号"
-              align="center"
           >
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
               prop="itemsName"
+              min-width="300"
               label="条款名称"
           >
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
               prop="termsConditions"
+              min-width="200"
               label="条款内容"
               :resizable="false"
           >
@@ -705,18 +705,16 @@
           </el-table-column>
           <el-table-column
               prop="readContent"
-              width="160"
+              width="170"
               label="核心技术要求/变化点"
               show-overflow-tooltip
-              align="center"
           >
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
-              align="center"
               prop="comparedWithPrevious"
               label="基于上一版本差异"
-              width="150">
+              width="170">
           </el-table-column>
           <el-table-column
               prop="xccssrq"
@@ -3316,7 +3314,7 @@ export default {
 
 /deep/ .el-collapse-item__content {
   padding-bottom: 0px;
-  font-size: 13px;
+  font-size: 16px;
   color: #303133;
   line-height: 1.769230769230769;
 }

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -549,6 +549,7 @@
                       :disabled="formdisableflag"
                   ></custom-date-pick-group>
                 </template>
+<!--                关联信息-代替标准号-->
                 <template
                     v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'CHJL'">
                   <template
@@ -754,6 +755,9 @@
                                   :key="field.attrField"
                                   :config="field"
                                   clearable
+                                  type="textarea"
+                                  resize="none"
+                                  :autosize="true"
                                   v-model="sarStandardsInfoEO['QCDW']"
                                   :disabled="formdisableflag" placeholder="选择或输入起草单位">
                           </el-input>
@@ -5185,16 +5189,17 @@ export default {
           rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}]
         }
         if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') {
-          if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ') {
+
-            rule.push({type: 'string', max: 100, message: `${item.attrName}不能超过100个字符`, trigger: 'blur'})
+          // if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ') {
-          } else {
+          //   rule.push({type: 'string', max: 100, message: `${item.attrName}不能超过100个字符`, trigger: 'blur'})
-            rule.push({
+          // } else {
-              type: 'string',
+          //   rule.push({
-              max: item.attrLen,
+          //     type: 'string',
-              message: `${item.attrName}不能超过${item.attrLen}个字符`,
+          //     max: item.attrLen,
-              trigger: 'blur'
+          //     message: `${item.attrName}不能超过${item.attrLen}个字符`,
-            })
+          //     trigger: 'blur'
-          }
+          //   })
+          // }
         }
         if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ' || item.attrField === 'BYYBJ' || item.attrField === 'CBBH') {
           // rule.push({validator: this.verify.validateStandardItem, trigger: 'blur'})

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -233,7 +233,7 @@
 <!--        ><i class="iconfont">&#xe6de;</i>导入</el-button>-->
         <el-button
           class="common-button-default export-button"
-          round
+          size="mini"
           @click="exportStandard"
           title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
           v-btn-permission="'784d26f527a659eefe84d5e5a53deb96'"
@@ -247,20 +247,20 @@
 <!--        ><i class="iconfont">&#xe825;</i>模板下载</el-button>-->
         <el-button
             class="common-button-default delete-button"
-            round
+            size="mini"
             @click="deleteStand(2)"
             v-btn-permission="'374205ce36a859a158ca4db196d151b7'"
         ><i class="iconfont">&#xe61b;</i>批量删除
         </el-button>
         <el-button
           class="common-button-default"
-          round
+          size="mini"
           @click="configurationStandard"
           v-btn-permission="'381d34443196ca840118ae577ff30d5e'"
         ><i class="iconfont">&#xe669;</i>配置标准</el-button>
         <el-button
           class="common-button-default"
-          round
+          size="mini"
           @click="deleteEnterStandFromKind(2)"
           v-btn-permission="'2d41ebdb6150ba1af52fd753086d77dc'"
         ><i class="iconfont">&#xe611;</i>移除标准</el-button>

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -341,7 +341,6 @@
               <div v-else>
 
                   <div @click.stop style="display: inline-block">
-                    <el-dropdown trigger="click" @command="handleCommand">
                       <el-button title="收藏" class="collection-btn" icon="el-icon-star-off" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"
                                  v-if="scope.row.collectBtn"
                                  @click="handleCommand([scope.row, '收藏'])"
@@ -352,31 +351,6 @@
                                  @click="handleCommand([scope.row, '取消收藏'])"
                       >
                       </el-button>
-<!--                      <i class="iconfont">&#xe61e;</i>-->
-<!--                      <el-dropdown-menu slot="dropdown">-->
-<!--                        <el-dropdown-item-->
-<!--                            v-if="scope.row.collectBtn"-->
-<!--                            :command="[scope.row, '收藏']"-->
-<!--                            v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"-->
-<!--                        >-->
-<!--                          收藏-->
-<!--                        </el-dropdown-item>-->
-<!--                        <el-dropdown-item-->
-<!--                            v-else-->
-<!--                            :command="[scope.row, '取消收藏']"-->
-<!--                            v-btn-permission="'47e155667f521467ed941c89d118e770'"-->
-<!--                        >-->
-<!--                          取消收藏-->
-<!--                        </el-dropdown-item>-->
-<!--                        <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">-->
-<!--                          编辑-->
-<!--                        </el-dropdown-item>-->
-<!--                        &lt;!&ndash;                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>&ndash;&gt;-->
-<!--                        <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'b299fa5edb3f3f35badb2adb6bda9f2e'">-->
-<!--                          删除-->
-<!--                        </el-dropdown-item>-->
-<!--                      </el-dropdown-menu>-->
-                    </el-dropdown>
                   </div>
 
               </div>
@@ -946,6 +920,7 @@
                     :disabled="formdisableflag"
                   ></custom-date-pick-group>
                 </template>
+                <!--                关联信息-代替标准号-->
                 <template v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'CHJL'">
                   <template v-if="field.attrField === 'DTBJH' || field.attrField === 'YYBJ' || field.attrField === 'BYYBJ' || field.attrField === 'CBBH' || field.attrField === 'DXBZ'">
                     <custom-input-for-standards
@@ -2740,6 +2715,7 @@ export default {
         this.$nextTick(() => {
           Promise.all([this.queryDisplayLocation()]).then((values) => {
             const [displayLocation] = values
+            console.log('2717', displayLocation)
             const formFieldList = this.formFieldList
             this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
             this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
@@ -2794,6 +2770,7 @@ export default {
               })
             })
             this.dynamicFormField = displayLocation
+            console.log('2771',this.dynamicFormField)
             this.loading = false
           })
         })
@@ -3230,6 +3207,7 @@ export default {
             const formFieldList = this.formFieldList
             formFieldList.forEach((field) => {
               displayLocation.forEach((location) => {
+                console.log(location)
                 let value = dynamicFormField[field.attrField]
                 if (value && typeof value === 'number') {
                   value = this.$dateFormat(value, 'yyyy-MM-dd')
@@ -4635,23 +4613,23 @@ export default {
           rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}]
         }
         if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') {
-          if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ') {
+          // if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ') {
-            rule.push({type: 'string', max: 100, message: `${item.attrName}不能超过100个字符`, trigger: 'blur'})
+          //   rule.push({type: 'string', max: 100, message: `${item.attrName}不能超过100个字符`, trigger: 'blur'})
-          } else {
+          // } else {
-            rule.push({
+          //   rule.push({
-              type: 'string',
+          //     type: 'string',
-              max: item.attrLen,
+          //     max: item.attrLen,
-              message: `${item.attrName}不能超过${item.attrLen}个字符`,
+          //     message: `${item.attrName}不能超过${item.attrLen}个字符`,
-              trigger: 'blur'
+          //     trigger: 'blur'
-            })
+          //   })
-          }
+          // }
         }
         if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ' || item.attrField === 'BYYBJ' || item.attrField === 'CBBH' || item.attrField === 'DXBZ') {
-          if (item.attrField === 'CBBH') {
+          // if (item.attrField === 'CBBH') {
-            rule.push({type: 'string', validator: this.verify.validateStandardItemNoRepeat, trigger: 'blur'})
+          //   rule.push({type: 'string', validator: this.verify.validateStandardItemNoRepeat, trigger: 'blur'})
-          } else {
+          // } else {
-            rule.push({type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur'})
+          //   rule.push({type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur'})
-          }
+          // }
         }
         if (rule.length > 0) {
           // this.$set(this.rules, item.attrField, rule)

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -162,7 +162,7 @@
               label="责任部门">
             </el-table-column>
             <el-table-column
-              prop="dutyEngineer"
+              prop="dutyEngineerName"
               width="100"
               label="责任工程师">
             </el-table-column>
@@ -415,56 +415,19 @@
               <el-col :span="24">
                 <el-form :model="addForm" inline class="label-input-form" :rules="formRules" label-width="180px"
                          ref="addForm">
-                  <el-form-item prop="productName" label="项目名称" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-select v-model="addForm.productName" filterable  @change="handleChange" placeholder="请选择项目名称">
-                      <el-option
-                        v-for="item in ProjectDatas"
-                        :key="item.id"
-                        :label="item.projectName"
-                        :value="item"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item prop="productId" label="项目编号" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-input
-                      :disabled="true"
-                      v-model="addForm.productId"
-                      placeholder="请输入项目编号"
-                    />
-                  </el-form-item>
-                  <el-form-item prop="productType" label="产品类型" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-input
-                      :disabled="true"
-                      v-model="addForm.productType"
-                      placeholder="请输入产品类型"
-                    />
-                  </el-form-item>
-                  <el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-input
-                      :disabled="true"
-                      v-model="addForm.productLine"
-                      placeholder="请输入产品线"
-                    />
-                  </el-form-item>
                   <el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
-                    <el-select
+                    <el-input
                       v-model="addForm.standSerialNumber"
-                      filterable
+                      placeholder="请输入标准名称"
-                      :disabled="serialNumber"
+                    />
-                      @change="standChange"
+                    <el-button
-                      placeholder="请选择标准号">
+                      type="primary"
-                      <el-option
+                      class="common-button-primary"
-                        v-for="item in dataList"
+                      size="mini"
-                        :key="item.standId"
+                      style="position:absolute;top: 10px;right: 0;"
-                        :label="item.standSort + '-' + item.standNumber + '-' + item.standYear"
+                      @click="showStand"
-                        :value="item"
+                    >手动查找</el-button>
-                      ></el-option>
-                    </el-select>
                   </el-form-item>
                   <el-form-item prop="standName" label="标准名称" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -489,6 +452,41 @@
                       placeholder="请输入条款名称"
                       :maxlength="500" />
                   </el-form-item>
+                  <el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
+                                class="add-form-item">
+                    <!--                    <el-input-->
+                    <!--                      :disabled="true"-->
+                    <!--                      v-model="addForm.productLine"-->
+                    <!--                      placeholder="请输入产品线"-->
+                    <!--                    />-->
+                    <el-select v-model="addForm.productLine" filterable  @change="handleChangeLine" placeholder="请选择产品线">
+                      <el-option
+                        v-for="item in productLines"
+                        :key="item.id"
+                        :label="item.productLine"
+                        :value="item"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="productName" label="项目名称" style="width: 100%; margin-right:10px"
+                                class="add-form-item">
+                    <el-select v-model="addForm.productName" filterable  @change="handleChange" placeholder="请选择项目名称">
+                      <el-option
+                        v-for="item in ProjectDatas"
+                        :key="item.id"
+                        :label="item.projectName"
+                        :value="item"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="productId" label="项目编号" style="width: 100%; margin-right:10px"
+                                class="add-form-item">
+                    <el-input
+                      :disabled="true"
+                      v-model="addForm.productId"
+                      placeholder="请输入项目编号"
+                    />
+                  </el-form-item>
                   <el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
@@ -579,6 +577,136 @@
       :nodeList="nodeListZRBM"
       @checkedRole="drawerCheckZRBM"
     />
+    <el-dialog
+      title="添加标准"
+      :visible.sync="dialogTableVisible"
+       width="875px"
+      :close-on-click-modal="false"
+      :append-to-body="true"
+    >
+      <div class="search-area">
+        <div class="left">
+          <el-form :modal="standardSearch" :inline="true" class="label-input-form"
+                   style="margin-left:10px">
+            <el-form-item label="类型" class="search-item search-item-last">
+              <el-select
+                @change="typeChange"
+                v-model="standardSearch.standType"
+                placeholder="请选择"
+                filterable
+              >
+                <el-option
+                  v-for="item in standardTypeOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="标准号/标准名称" class="search-item search-item-last">
+              <el-input
+                v-model="standardSearch.standNumber"
+                placeholder="请输入标准号或标准名称"
+              ></el-input>
+            </el-form-item>
+            <el-form-item class="search-item btn-box">
+              <el-button
+                type="primary"
+                class="common-button-primary"
+                size="small"
+                v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                @click="getStandDataBtn">
+                查询
+              </el-button>
+            </el-form-item>
+            <el-form-item class="search-item btn-box">
+              <el-button
+                class="common-button-default"
+                size="small"
+                v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                @click="clearStandSearch">清空
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+      <el-table
+        :data="standardData"
+        tooltip-effect="dark"
+        style="width: 100%; overflow-y: auto;overflow-x: hidden;"
+        border
+        :height="300"
+        ref="table"
+        @selection-change="selectStand"
+        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="code"
+          align="center"
+          label="标准号">
+          <template slot-scope="scope">
+            <a v-if="scope.row.standYear" class="table-jump"
+               @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                scope.row.standNumber
+              }}-{{ scope.row.standYear }}</a>
+            <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                scope.row.standSortShow
+              }}
+              {{ scope.row.standNumber }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="standName"
+          align="center"
+          min-width="200"
+          label="标准名称"
+        >
+          <template slot-scope="scope">
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="issueTime"
+          align="center"
+          label="发布日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="XCXSSRQ"
+          align="center"
+          label="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="ZCCSSRQ"
+          align="center"
+          label="在产车实施日期">
+        </el-table-column>
+      </el-table>
+      <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
+      <!--分页-->
+      <pagination
+        style="position: relative;"
+        :page="page"
+        :pageSize="pageSize"
+        :total="total"
+        @pageChange="pageChange"
+        @pageSizeChange="pageSizeChange"
+      />
+      <div slot="footer"  class="demo-drawer-footer">
+        <el-button class="common-button-default" size="mini"  icon="el-icon-close" @click="cancelStand">取消</el-button>
+        <el-button type="primary"  size="mini" class="common-button-primary" icon="el-icon-check" @click="okStand">添加</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -593,11 +721,34 @@ export default {
       loading: false,
       nonList: [], //未符合项表格数据
       replaceLoading: false,
+      standList: [],
+      productLines: [], //产品线数据
       //项目数据
       ProjectDatas: [],
+      dialogTableVisible: false,
       itemsData: [],
       selectItems: [],
       dataList: [],
+      //查询添加标准相关数据
+      standardSearch: {
+        standType: "",
+        standNumber: "",
+        pageNo: 1,
+        pageSizeNo: this.$store.getters.userInfo.configContent
+      },
+      standardData: [], //存放标准数据
+      standardTypeOptions: [
+        {
+          value: "INLAND",
+          label: "国内标准法规",
+          item: "INLAND"
+        },
+        {
+          value: "FOREIGN",
+          label: "海外标准法规",
+          item: "FOREIGN"
+        }
+      ],
       page: 1,
       pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
@@ -685,9 +836,6 @@ export default {
       //数据查看
       historySee: false,
       historySeeForm: {},
-      // 新增编辑框的disabled
-      serialNumber: true,
-
       // 提交按钮loading
       submiting: false,
       // 选择人（单选）
@@ -749,6 +897,47 @@ export default {
         this.myLoading.loadData = false;
       });
     },
+    typeChange(type) {
+      console.log(type);
+      this.standardSearch.standType = type;
+    },
+    //取消添加
+    cancelStand(){
+      this.dialogTableVisible = false
+    },
+    //确认添加标准
+    okStand(){
+      if(this.standList > 1){
+        this.$message.warning('您只能选择一条标准进行添加')
+      }else if(this.standList < 1){
+        this.$message.warning('请至少选择一条数据进行添加')
+      }else{
+        this.addForm.standId = this.standList[0].id
+        this.addForm.standName = this.standList[0].standName
+        this.addForm.standSerialNumber = this.standList[0].standSort + '-' + this.standList[0].standNumber + '-' + this.standList[0].standYear
+        this.dialogTableVisible = false
+      }
+    },
+    //添加标准select的改变
+    selectStand(data) {
+      this.standList = data;
+    },
+    showStand(){
+      this.dialogTableVisible = true
+    },
+    //标准查询按钮
+    getStandDataBtn(){
+      this.page =1;
+      this.getStandDatas();
+    },
+    //清空查询按钮
+    clearStandSearch(){
+      this.standardSearch = {
+        standType: "",
+        standNumber: ""
+      };
+      this.getStandDatas();
+    },
     // 点击历史记录按钮事件
     historyClick() {
       this.$router.push({
@@ -873,25 +1062,24 @@ export default {
 
       }
     },
-    //获取项目数据
+    // //获取项目数据
-    getProjectData() {
+    // getProjectData() {
-      this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", {
+    //   this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", {
-        page: this.page,
+    //     page: 1,
-        pageSize: this.pageSize,
+    //     pageSize: 100,
-        ...this.projectSearch
+    //   }, {
-      }, {
+    //     _this: this
-        _this: this
+    //   }, res => {
-      }, res => {
+    //     if (res.data === null) {
-        if (res.data === null) {
+    //       this.ProjectDatas = "";
-          this.ProjectDatas = "";
+    //       this.total = 0;
-          this.total = 0;
+    //     } else {
-        } else {
+    //       this.ProjectDatas = res.data.Maintenance.records;
-          this.ProjectDatas = res.data.Maintenance.records;
+    //       this.total = res.data.Maintenance.total;
-          this.total = res.data.Maintenance.total;
+    //     }
-        }
+    //   });
-      });
+    //
-
+    // },
-    },
     //提交
     submit() {
       const id = this.addForm.id;
@@ -1004,13 +1192,31 @@ export default {
         });*/
       });
     },
+    //查询项目下的标准
+    getStandDatas() {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
+        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 => {
+          this.$set(item, "ZCCSSRQ", item.zccssrq);
+          this.$set(item, "XCXSSRQ", item.xcxssrq);
+        })
+        this.total = res.data.count;
+      }, e => {
+      });
+    },
     //新增事件
     addModel() {
       this.dataList = []
-      this.serialNumber = true
       this.drawerTitle = "新增";
-      this.getProjectData()
       this.drawerTable = true
+      this.getStandDatas()
     },
     //编辑事件
     projectEdit(row) {
@@ -1022,9 +1228,8 @@ export default {
         }
       })
       let productId = this.projectId
-      this.getProjectData()
+      // this.getProjectData()
       this.getStandData(productId)
-      this.serialNumber = false
       this.drawerTable = true;
     },
     //点击查看按钮事件
@@ -1091,6 +1296,15 @@ export default {
       });
     },
     // 分页事件
+    pageChange(page) {
+      this.page = page;
+      this.getStandDatas()
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getStandDatas()
+    },
+    // 分页事件
     pageChangeNo(page) {
       this.pageNo = page;
       this.getTableByPage();
@@ -1099,6 +1313,11 @@ export default {
       this.pageSizeNo = pageSize;
       this.getTableByPage();
     },
+    //产品线change事件
+    handleChangeLine(val){
+      this.addForm.productLine = val.productLine
+      this.ProjectDatas = val.sarStandProjectLibraries
+    },
 
     /** 项目名称change事件 */
     handleChange(val) {
@@ -1108,18 +1327,11 @@ export default {
       }
       this.addForm.productId = val.id
       this.addForm.productId = val.projectNumber
-      this.addForm.productLine = val.productLine
       this.addForm.productName = val.projectName
       this.addForm.productType = val.projectPlatfor
       this.serialNumber = false
-      let productId = val.id
+      // let productId = val.id
-      this.getStandData(productId)
+      // this.getStandData(productId)
-    },
-    /** 标准号change事件 */
-    standChange(item) {
-      this.addForm.standId = item.standId
-      this.addForm.standName = item.standName
-      this.addForm.standSerialNumber = item.standSort + '-' + item.standNumber + '-' + item.standYear
     },
     /** 责任工程师选择 */
     choiceZRR(type, title, id) {
@@ -1179,11 +1391,28 @@ export default {
       this.addForm.responsibleUnit = nameList;
 
     },
+    //获取产品线数据
+    getProductData() {
+      this.$http.get("sarStandProjectLibrary/queryProjectManager", {
+        current: 1,
+        PageSize:100,
+      }, {
+        _this: this
+      }, res => {
+        res.data.records.forEach(item => {
+          if(item.productLine){
+            this.productLines.push(item)
+          }
+        })
+      }, e => {
+
+      });
+    },
 
   },
   mounted() {
-    //查询已维护的项目
+    //查询产品线
-    this.getProjectData();
+    this.getProductData()
     this.getData()
     // 加载所有的部门
     this.getOrgTreeSource();
@@ -1192,6 +1421,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+/deep/.el-dialog__body{
+  padding: 15px 20px;
+}
 .el-select-dropdown__item.selected {
   color: #606266 !important;
 }
@@ -1270,6 +1502,5 @@ export default {
       }
     }
   }
-
 }
 </style>