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

spring

10 天以前 0c445ac6d2a20153e5eac390555ba88f950d76b0

 src/views/equipmentManagement/measurementEquipment/components/formDia.vue

@@ -90,23 +90,23 @@
                  </el-form-item>
               </el-col>
            </el-row>
            <el-row :gutter="30">
               <el-col :span="24">
                  <el-form-item label="附件材料：" prop="remark">
                     <el-upload v-model:file-list="fileList" :action="upload.url" multiple ref="fileUpload" auto-upload
                                     :headers="upload.headers" :before-upload="handleBeforeUpload" :on-error="handleUploadError"
                                     :on-success="handleUploadSuccess" :on-remove="handleRemove">
                        <el-button type="primary" v-if="operationType !== 'view'">上传</el-button>
                        <template #tip v-if="operationType !== 'view'">
                           <div class="el-upload__tip">
                              文件格式支持
                              doc，docx，xls，xlsx，ppt，pptx，pdf，txt，xml，jpg，jpeg，png，gif，bmp，rar，zip，7z
                           </div>
                        </template>
                     </el-upload>
                  </el-form-item>
               </el-col>
            </el-row>
<!--            <el-row :gutter="30">-->
<!--               <el-col :span="24">-->
<!--                  <el-form-item label="附件材料：" prop="remark">-->
<!--                     <el-upload v-model:file-list="fileList" :action="upload.url" multiple ref="fileUpload" auto-upload-->
<!--                                     :headers="upload.headers" :before-upload="handleBeforeUpload" :on-error="handleUploadError"-->
<!--                                     :on-success="handleUploadSuccess" :on-remove="handleRemove">-->
<!--                        <el-button type="primary" v-if="operationType !== 'view'">上传</el-button>-->
<!--                        <template #tip v-if="operationType !== 'view'">-->
<!--                           <div class="el-upload__tip">-->
<!--                              文件格式支持-->
<!--                              doc，docx，xls，xlsx，ppt，pptx，pdf，txt，xml，jpg，jpeg，png，gif，bmp，rar，zip，7z-->
<!--                           </div>-->
<!--                        </template>-->
<!--                     </el-upload>-->
<!--                  </el-form-item>-->
<!--               </el-col>-->
<!--            </el-row>-->
         </el-form>
         <template #footer>
            <div class="dialog-footer">
@@ -140,6 +140,7 @@
      nextDate: "",
      userId: "",
      recordDate: "",
    tempFileIds: []
   },
   rules: {
      code: [{required: true, message: "请输入", trigger: "blur"}],
@@ -191,6 +192,7 @@
   proxy.$modal.closeLoading();
   if (res.code === 200) {
      file.tempId = res.data.tempId;
    form.value.tempFileIds.push(res.data.tempId)
      proxy.$modal.msgSuccess("上传成功");
   } else {
      proxy.$modal.msgError(res.msg);
@@ -214,11 +216,13 @@
         if (operationType.value === "add") {
            measuringInstrumentAdd(form.value).then(response => {
               proxy.$modal.msgSuccess("新增成功")
          form.value.tempFileIds = []
               closeDia()
            })
         } else {
            measuringInstrumentUpdate(form.value).then(response => {
               proxy.$modal.msgSuccess("修改成功")
          form.value.tempFileIds = []
               closeDia()
            })
         }