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

src/pages/home2/components/todoList/index.vue

@@ -9,13 +9,13 @@
     </div>
     <ul>
       <li v-for="item in toDoTaskList" :key="item.id" class="time-title">
-        <div style="height: 30px">
+        <div style="min-height: 30px">
-          <span @click="dealWith(item)" v-if="item.prcName.length<24"
+          <span @click="dealWith(item)"
-                style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item) }}</span>
+                style="line-height: 30px; font-size: 13px;display: inline-block;width: 400px;">{{ getPrcNameFilter(item) }}</span>
-          <el-tooltip class="item" effect="dark" :content="getPrcNameFilter(item)" placement="left" v-else>
+<!--          <el-tooltip class="item" effect="dark" :content="getPrcNameFilter(item)" placement="left" v-else>-->
-            <span @click="dealWith(item)"
+<!--            <span @click="dealWith(item)"-->
-                  style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 32) + '...' }}</span>
+<!--                  style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 32) + '...' }}</span>-->
-          </el-tooltip>
+<!--          </el-tooltip>-->
         </div>
       </li>
     </ul>

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

@@ -437,6 +437,7 @@
                   v-model="plForm.technicalRequir"
                   placeholder="请输入核心技术要求"
                   maxlength="500"
+                  :autosize="{minRows:10,maxRows:10}"
                 ></el-input>
               </el-form-item>
               <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -1769,11 +1769,16 @@
                 <el-col :span="12">
                   <!--            归口管理部门-->
                   <el-form-item label="归口管理部门" class="add-form-item form-item-disabled">
-                    <el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable>
+                    <search-select
-                      <el-option v-for="(opt, index) in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"
+                      v-model="advanceSearchMapping.GKDW"
-                                 :key="index" :label="opt.label">{{ opt.label }}
+                      :placeholder="'归口管理部门'"
-                      </el-option>
+                      :options="gkglbmOptions"
-                    </el-select>
+                      clearable/>
+<!--                    <el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable>-->
+<!--                      <el-option v-for="(opt, index) in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"-->
+<!--                                 :key="index" :label="opt.label">{{ opt.label }}-->
+<!--                      </el-option>-->
+<!--                    </el-select>-->
                   </el-form-item>
                   <!--            我司参与深度-->
                   <el-form-item label="我司参与深度" class="add-form-item form-item-disabled">

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -809,7 +809,7 @@
                         {required: true, message: '请选择起草人', trigger: 'change'},
                     ],
                     rqbJson: [
-                        {required: true, message: '请选择代替企标编号', trigger: 'change'},
+                        {required: false, message: '请选择代替企标编号', trigger: ['change', 'blur']},
                     ]
                 },
                 form: {
@@ -1038,6 +1038,7 @@
                 }
                 this.addForm.unit = list
                 this.addForm.unitName = listName
+                this.$refs.addForm.validateField('unitName')
                 this.modalshowflagZRBM = false
             },
             choiceZRBM(id) {
@@ -1161,7 +1162,32 @@
             },
             addData () {
                 this.addDrawerTitle = '新增'
-                this.addForm = {}
+                this.addForm = {
+                  bussSort:'',
+                  esMatingRelations: '',
+                  technologic: '',
+                  useLevel: '',
+                  isRelate: '',
+                  esStandRelations: '',
+                  area: [],
+                  tsJson: '',
+                  tsJsonName: '',
+                  rqbJson: '',
+                  rqbName: '',
+                  unit: '', // 单位
+                  unitName: '',
+                  esName: '', // 企标名称
+                  planStatus: '', // 计划状态
+                  reviseStatus: '', // 制修订状态
+                  resPerson: '', // 评审责任人
+                  resPersonName: '',
+                  wgLeader: '', // 工作组组长
+                  wgLeaderName: '',
+                  draftTime: '', // 计划标准初稿完成时间
+                  releaseTime: '', // 计划标准发布时间
+                  drafter: '', // 起草人
+                  drafterName: ''
+                }
                 this.DrawerType = 'add'
                 this.addForm.planStatus = '0'
                 this.addDrawer = true

src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue

@@ -457,7 +457,7 @@ export default {
       let routeUrl = this.$router.resolve({
         name: 'OtherStandardDetails',
         params: {
-          id: item.id,
+          id: item.standId,
           pageType: 'INLAND_STAND'
           // pageType: item.standType + '_STAND'
         }