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

src/pages/config/pages/mechanismManage/pages/mechanism.vue

@@ -392,6 +392,7 @@ export default {
     },
     handleNodeClick(data) {
       this.id = data.id
+      this.page = 1
       this.getData()
     },
     // searchPeople(){

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

@@ -2152,6 +2152,7 @@ export default {
             }, res => {
               if (res && res.data) {
                 const bringData = res.data
+                bringData.txlb = ''
                 bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
                 bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
                 const json = Object.assign(bringData, bringData.attrInfoCaseMap);

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

@@ -1225,6 +1225,7 @@ export default {
           if (this.form.zrgcs.length === 0) {
             this.form.zrgcs = ''
           }
+          this.form.menuIds = this.form.treeListId
           const json = JSON.stringify(this.form);
           this.$http.post('lawss/activiti/completeTask', {
             taskIds: this.taskIds,
@@ -1260,17 +1261,13 @@ export default {
       processCreateStand(_formData).then(res => {
         if (res.result === '操作成功' || res.data === '入库成功') {
           this.$message.success(res.data)
-          let menuList = {
+          /*this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenuForFlow', menuList, {
-            idlist: [this.form.standId],
-            menuIds: this.form.treeListId
-          }
-          this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenuForFlow', menuList, {
             _this: this,
           }, resMenu => {
             if (resMenu.ok) {
               console.log(resMenu)
             }
-          })
+          })*/
           setTimeout(() => {
             this.$router.push({
               name: 'ProcessCenter'

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

@@ -117,6 +117,7 @@
                   <el-date-picker
                     v-model="form.issueTime"
                     type="date"
+                    value-format="yyyy-MM-dd"
                     placeholder="请选择标准发布日期">
                   </el-date-picker>
                 </el-form-item>

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

@@ -346,7 +346,7 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
+                <!--<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                   <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
                     <el-option
                       v-for="item in txlbOptions"
@@ -356,7 +356,7 @@
                       :label="item.label"
                     ></el-option>
                   </el-select>
-                </el-form-item>
+                </el-form-item>-->
               </el-col>
               <el-col :span="12">
                 <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">

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

@@ -349,18 +349,13 @@
                 }}</a>
             </template>
           </el-table-column>
-          <!--          <el-table-column-->
+          <el-table-column
-          <!--            show-overflow-tooltip-->
+            show-overflow-tooltip
-          <!--            prop="standEnName"-->
+            prop="dtqbbhbuss"
-          <!--            label="英文名称"-->
+            label="代替企标编号"
-          <!--            min-width="300"-->
+            min-width="300"
-          <!--          >-->
+          >
-          <!--            <template slot-scope="scope">-->
+          </el-table-column>
-          <!--              <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>-->
-          <!--              <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>-->
-          <!--              <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
           <el-table-column
             prop="issueTime"
             label="发布日期"

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -659,14 +659,14 @@
                                       </el-select>
                                     </el-form-item>-->
                   <!--            体系类别-->
-                  <el-form-item label="体系类别" class="add-form-item form-item-disabled">
+                 <!-- <el-form-item label="体系类别" class="add-form-item form-item-disabled">
                     <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
                                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                       <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
                                  :label="opt.label">{{ opt.label }}
                       </el-option>
                     </el-select>
-                  </el-form-item>
+                  </el-form-item>-->
                   <!--            责任工程师-->
                   <template>
                     <el-form-item