新需求优化

src/views/company-manage/performance-manage/components/addAndEditForm.vue

@@ -22,13 +22,22 @@
                 </el-col>
                 <el-col :span="8">
                     <el-form-item label="电压等级" prop="voltage">
-                        <el-input
+                        <!-- <el-input
                             clearable
                             maxlength="20"
                             show-word-limit
                             placeholder="请输入电压等级"
                             v-model="addAndEditForm.voltage"
-                        />
+                        /> -->
+
+                        <el-select v-model="addAndEditForm.voltage" placeholder="请选择电压等级" style="width: 100%">
+                            <el-option
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                                v-for="item in dict.type.voltage_level"
+                            />
+                        </el-select>
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -68,7 +77,7 @@
                         />
                     </el-form-item>
                 </el-col>
-                <el-col :span="8">
+                <el-col :span="4">
                     <el-form-item label="线路建设规模" prop="lineScale">
                         <el-input
                             clearable
@@ -79,6 +88,21 @@
                         />
                     </el-form-item>
                 </el-col>
+                <el-col :span="4">
+                    <el-form-item>
+                        <template #label>
+                            <span>合同金额</span>
+                            <span style="color: #999; font-size: 12px"> (万元) </span>
+                        </template>
+                        <el-input
+                            clearable
+                            maxlength="20"
+                            show-word-limit
+                            placeholder="请输入合同金额"
+                            v-model="addAndEditForm.lineScale"
+                        />
+                    </el-form-item>
+                </el-col>
             </el-row>
             <el-row :gutter="20">
                 <el-col :span="8">
@@ -92,6 +116,31 @@
                         />
                     </el-form-item>
                 </el-col>
+                <el-col :span="8">
+                    <el-form-item label="项目所在地" prop="ownerUnit">
+                        <el-input
+                            clearable
+                            maxlength="50"
+                            show-word-limit
+                            placeholder="请输入项目所在地"
+                            v-model="addAndEditForm.ownerUnit"
+                        />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item label="工程质量" prop="ownerPhone">
+                        <el-input
+                            clearable
+                            maxlength="11"
+                            show-word-limit
+                            placeholder="请输入工程质量"
+                            v-model="addAndEditForm.ownerPhone"
+                        />
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+            <el-row :gutter="20">
                 <el-col :span="8">
                     <el-form-item label="业主单位" prop="ownerUnit">
                         <el-input
@@ -104,12 +153,64 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                    <el-form-item label="业务单位联系方式" prop="ownerPhone">
+                    <el-form-item label="业主单位联系方式" prop="ownerPhone">
                         <el-input
                             clearable
                             maxlength="11"
                             show-word-limit
-                            placeholder="请输入业务单位联系方式"
+                            placeholder="请输入业主单位联系方式"
+                            v-model="addAndEditForm.ownerPhone"
+                        />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item label="业主单位地址" prop="ownerPhone">
+                        <el-input
+                            clearable
+                            maxlength="11"
+                            show-word-limit
+                            placeholder="请输入业主单位地址"
+                            v-model="addAndEditForm.ownerPhone"
+                        />
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+            <el-row :gutter="20">
+                <el-col :span="8">
+                    <el-form-item label="总监理工程师及电话" prop="ownerUnit">
+                        <el-input
+                            clearable
+                            maxlength="50"
+                            show-word-limit
+                            placeholder="请输入总监理工程师及电话"
+                            v-model="addAndEditForm.ownerUnit"
+                        />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="16">
+                    <el-form-item label="备注" prop="ownerPhone">
+                        <el-input
+                            clearable
+                            maxlength="11"
+                            show-word-limit
+                            placeholder="请输入备注"
+                            v-model="addAndEditForm.ownerPhone"
+                        />
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+            <el-row :gutter="20">
+                <el-col :span="24">
+                    <el-form-item label="项目概况" prop="ownerPhone">
+                        <el-input
+                            clearable
+                            maxlength="5000"
+                            show-word-limit
+                            type="textarea"
+                            :autosize="{ minRows: 4, maxRows: 10 }"
+                            placeholder="请输入项目概况"
                             v-model="addAndEditForm.ownerPhone"
                         />
                     </el-form-item>
@@ -350,6 +451,7 @@ import { getToken } from '@/utils/auth'
 import { getKeyPersonListAPI, deleteImgAPI } from '@/api/common'
 import { addCompanyPerformanceAPI, editCompanyPerformanceAPI } from '@/api/company-manage/performance-manage'
 export default {
+    dicts: ['voltage_level'],
     components: {
         UploadImg,
     },
@@ -865,6 +967,7 @@ export default {
                                 url: this.fileViewUrl + e.filePath + '?file_token=' + getToken(),
                             }
                         })
+                    this.addAndEditForm.voltage = newValueObj.dictValue
                 }
             },
             deep: true,

src/views/company-manage/performance-manage/index.vue

@@ -204,7 +204,7 @@ export default {
             if (type === 2 || type === 3) {
                 const {
                     proName,
-                    voltage,
+                    dictValue,
                     startTime, // 开始时间
                     endTime, // 结束时间
                     stopTime, // 竣工日期
@@ -219,7 +219,7 @@ export default {
                 } = row
                 Object.assign(this.editRow, {
                     proName,
-                    voltage,
+                    dictValue,
                     startTime, // 开始时间
                     endTime, // 结束时间
                     stopTime, // 竣工日期

src/views/sub-manage/sub-manage/components/addAndEditForm.vue

@@ -36,12 +36,12 @@
             </el-row>
             <el-row :gutter="20">
                 <el-col :span="12">
-                    <el-form-item label="负责人" prop="userName">
+                    <el-form-item label="法定代表人" prop="userName">
                         <el-input
                             clearable
                             maxlength="10"
                             show-word-limit
-                            placeholder="请输入负责人"
+                            placeholder="请输入法定代表人"
                             v-model="addAndEditForm.userName"
                         />
                     </el-form-item>
@@ -64,11 +64,11 @@
                         <template #label>
                             <span>公司资质</span>
                             <span style="color: #999; font-size: 12px">
-                                (请上传公司营业执照、生产许可证以及其他相关资质证书图片、最多上传20张，仅支持jpg、png、jpeg格式)
+                                (请上传公司营业执照、生产许可证以及其他相关资质证书图片、最多上传30张，仅支持jpg、png、jpeg格式)
                             </span>
                         </template>
                         <UploadImg
-                            :limit="20"
+                            :limit="30"
                             :file-size="10"
                             :multiple="true"
                             @deleteFile="deleteFile"

src/views/sub-manage/sub-manage/index.vue

@@ -115,7 +115,7 @@ export default {
             tableList: [], // 列表
             tableColumn: [
                 { label: '分包商名称', prop: 'subName' },
-                { label: '负责人', prop: 'userName' },
+                { label: '法定代表人', prop: 'userName' },
                 { label: '联系方式', prop: 'userPhone' },
                 { label: '公司地址', prop: 'address' },
             ],

src/views/sub-manage/sub-performance-manage/components/addAndEditForm.vue

@@ -94,13 +94,22 @@
             <el-row :gutter="20">
                 <el-col :span="8">
                     <el-form-item label="电压等级" prop="voltage">
-                        <el-input
+                        <!-- <el-input
                             clearable
                             maxlength="30"
                             show-word-limit
                             placeholder="请输入电压等级"
                             v-model="addAndEditForm.voltage"
-                        />
+                        /> -->
+
+                        <el-select v-model="addAndEditForm.voltage" placeholder="请选择电压等级" style="width: 100%">
+                            <el-option
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                                v-for="item in dict.type.voltage_level"
+                            />
+                        </el-select>
                     </el-form-item>
                 </el-col>
             </el-row>
@@ -200,6 +209,7 @@ import { getToken } from '@/utils/auth'
 import { getSubListAPI, getSubKeyPersonListAPI, deleteImgAPI } from '@/api/common'
 import { addSubPerformanceManageAPI, editSubPerformanceManageAPI } from '@/api/sub-manage/sub-performance-manage'
 export default {
+    dicts: ['voltage_level'],
     components: {
         UploadImg,
     },
@@ -277,8 +287,8 @@ export default {
                         trigger: 'blur',
                     },
                     {
-                        pattern: /^([1-9]\d{0,3}(\.\d{1,4})?|0\.[0-9]*[1-9][0-9]*)$/,
+                        pattern: /^([1-9]\d{0,4}(\.\d{1,4})?|0\.[0-9]*[1-9][0-9]*)$/,
-                        message: '请输入正确的金额,金额最多保留4位小数，最大为9999.9999',
+                        message: '请输入正确的金额,金额最多保留4位小数，最大为99999.9999',
                         trigger: 'blur',
                     },
                 ],
@@ -526,6 +536,7 @@ export default {
                             url: this.fileViewUrl + e.filePath + '?file_token=' + getToken(),
                         }
                     })
+                    this.addAndEditForm.voltage = newValueObj.dictValue
                 }
             },
             deep: true,

src/views/sub-manage/sub-performance-manage/index.vue

@@ -205,11 +205,11 @@ export default {
                     consUnit, // 项目建设单位
                     htRemark, // 合同身份
                     money, // 分包商合同额
-                    voltage, // 电压等级
                     startTime, // 开始时间
                     endTime, // 结束时间
                     tbCompanyPerfRelList,
                     tbFileSourceVoList,
+                    dictValue,
                     id, // 主键id
                 } = row
                 Object.assign(this.editRow, {
@@ -218,11 +218,11 @@ export default {
                     consUnit, // 项目建设单位
                     htRemark, // 合同身份
                     money, // 分包商合同额
-                    voltage, // 电压等级
                     startTime, // 开始时间
                     endTime, // 结束时间
                     tbCompanyPerfRelList,
                     tbFileSourceVoList,
+                    dictValue,
                     id, // 主键id
                 })
             }