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

src/pages/details/otherStandardDetails/index.vue

@@ -266,9 +266,9 @@
                       <p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
                           sarStandardsInfoEO.issueTime || '-'
                         }}</span></p>
-                      <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准性质</label><span>{{
+<!--                      <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准性质</label><span>{{-->
-                          standMap[sarStandardsInfoEO.standNature] || '-'
+<!--                          standMap[sarStandardsInfoEO.standNature] || '-'-->
-                        }}</span></p>
+<!--                        }}</span></p>-->
                       <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label
                         style=" margin-right: 150px;">标准体系</label><span>{{
                           sarStandardsInfoEO.standSystem || '-'
@@ -374,7 +374,7 @@
                     v-else-if="child.attrType === 'DATE_PICKER'"
                     class="modular-content-p-val"
                   >
-                {{ child.value ? child.value.substring(0, 10) : '-' }}
+                {{ child.value ? child.value : '-' }}
               </span>
                   <span
                     v-else-if="child.attrType !== 'FILE'"
@@ -3124,7 +3124,6 @@ export default {
     },
     // 分解单----查看标准条款相关
     selectSarStandItems(id, flag) {
-      this.page7 = 1
       this.standItemSearch.standId = this.sarStandardsInfoEO.id
       this.standItemSearch.fileType = this.fileType
       this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
@@ -3675,6 +3674,7 @@ export default {
         //   return
         // }
         displayLocation.forEach((location) => {
+          console.log(location);
           location.isShowImp = '0'
           if (dynamicFormField) {
             let value = dynamicFormField[field.attrField]

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -380,7 +380,7 @@
         name="file"
         drag
         :file-list="rh_pageData.infoSources"
-        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF, .pptx"
         :http-request="httpRequest"
         :before-upload="handleBeforeUpload"
         :before-remove="handleBeforeRemove"
@@ -603,7 +603,7 @@ export default {
       // 判断上传文件格式
       if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip'
         || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF'
-        || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.PPT'
+        || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.pptx'
         || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp') {
         return true
       } else {

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -312,7 +312,7 @@
         name="file"
         drag
         :file-list="ch_pageData.fileTextList"
-        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF,.pptx"
         :http-request="httpRequest"
         :before-upload="handleBeforeUpload"
         :before-remove="handleBeforeRemove"
@@ -539,7 +539,7 @@ export default {
       // 判断上传文件格式
       if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip'
         || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF'
-        || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.PPT'
+        || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.pptx'
         || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp'
       ) {
         return true

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

@@ -158,6 +158,7 @@
                     :disabled="true"
                 ></custom-date-pick-group>
                 <custom-date-pick-group
+                    :labelWidth="210"
                     :key="'zccssrq'"
                     :config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
                     v-model="form.zccssrq"
@@ -184,6 +185,7 @@
               </el-col>
               <el-col :span="12">
                 <custom-date-pick-group
+                    :labelWidth="210"
                     :key="'zccssrq'"
                     :config="{attrName:'新车型实施日期(标准文本)',attrField:'zccssrq'}"
                     v-model="form.xcxssrq"
@@ -421,14 +423,14 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>-->
-                <el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
+                <el-form-item label="关联模块--乘用车vpps中文名称" label-width="210px" prop="cycvppscn" class="add-form-item form-item-disabled">
                   <el-input
                       v-model="form.cycvppscn"
                       disabled
                       clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="关联模块--卡车vpps中文名称" prop="kccvppscn" class="add-form-item form-item-disabled">
+                <el-form-item label="关联模块--卡车vpps中文名称" label-width="210px" prop="kccvppscn" class="add-form-item form-item-disabled">
                   <el-input
                       v-model="form.kccvppscn"
                       disabled

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -3713,7 +3713,7 @@ export default {
             }
             break
           case 'textStatus' :
-            this.orderBy = 5;
+            this.orderBy = 4;
             this.nowOrder = sortObj.column.order
             if (this.nowOrder === 'ascending') {
               this.nowOrder = 2