COMMIT

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/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>

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -920,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
@@ -2714,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];
@@ -2768,6 +2770,7 @@ export default {
               })
             })
             this.dynamicFormField = displayLocation
+            console.log('2771',this.dynamicFormField)
             this.loading = false
           })
         })
@@ -3204,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')