提交代码

feige

2024-03-23 f4357cc86cd66e27476bc865b8a61b04c1e7c59a

提交代码

 ruoyi-ui/src/api/pet/index.js

@@ -90,6 +90,14 @@


//上传文件
export function uploadPic1(data) {
  return request({
    url: '/common/upload',
    method: 'post',
    data: data
  })
}
//上传文件
export function uploadPic(data) {
  return request({
    url: '/common/uploads',

 ruoyi-ui/src/views/economy/economyInfo.vue

@@ -15,8 +15,11 @@
    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px">

      <el-form-item label="台账" prop="type">
        <el-input v-model="formData.type" placeholder="请输入台账内容" clearable :style="{width: '100%'}" :disabled="dsb" >
       <el-input v-model="formData.type" placeholder="请输入台账内容" clearable :style="{width: '100%'}" :disabled="dsb" >
        </el-input>
<!-- 		
          <el-select v-model="formData.type"     filterable clearable  placeholder="请输入台账内容" clearable :style="{width: '100%'}" :disabled="dsb" >
                </el-select> -->
      </el-form-item>
      <el-form-item label="时间" prop="createTime">
        <el-input v-model="formData.createTime" placeholder="请选择时间" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>

 ruoyi-ui/src/views/note/propertyInfo.vue

@@ -21,10 +21,14 @@
    <el-form ref="elForm" :model="formData"  :rules="rules" size="medium" label-width="100px">

      <el-form-item label="类型" prop="type">
        <el-select v-model="formData.type" placeholder="请选择类别" clearable :style="{width: '100%'}" :disabled="dsb" >
        <el-select v-model="formData.type" placeholder="请选择类别"  allow-create
        filterable clearable :style="{width: '100%'}" :disabled="dsb" >
          <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
                     :disabled="item.disabled"></el-option>
        </el-select>
		
		
	
      </el-form-item>

      <el-form-item label="发生时间" prop="happenTime" >

 ruoyi-ui/src/views/pet/index.vue

@@ -332,7 +332,7 @@


//在system/note/index.js中导入接口函数
import {listPet,enload, getPetInfo, delPet,addPet, uploadPic} from "@/api/pet/index";
import {listPet,enload, getPetInfo, delPet,addPet, uploadPic1} from "@/api/pet/index";
export default {
  name: "Role",
  dicts: ['sys_normal_disable'],
@@ -732,7 +732,7 @@
      formData.append('uploadFile', file);
      let _this = this

      uploadPic(formData).then(response => {
      uploadPic1(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
        _this.fileList1.push({name:response.data.fileName, url:response.data.url})
        // _this.fileList2.push({name:response.data.fileName, url:response.data.url})
@@ -748,7 +748,7 @@
      formData.append('uploadFile', file);
      let _this = this

      uploadPic(formData).then(response => {
      uploadPic1(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
        // _this.fileList1.push({name:response.data.fileName, url:response.data.url})
        _this.fileList2.push({name:response.data.fileName, url:response.data.url})

 ruoyi-ui/src/views/pet/petInfo.vue

@@ -387,7 +387,7 @@
  </div>
</template>
<script>
import {getPetList, listPetnote,uploadPic, download,updatePet} from "@/api/pet/index";
import {getPetList, listPetnote,uploadPic1, download,updatePet} from "@/api/pet/index";
import {addRole, updateRole} from "@/api/system/role";
import {blobValidate} from "@/utils/ruoyi";
import errorCode from "@/utils/errorCode";
@@ -619,7 +619,7 @@
      formData.append('uploadFile', file);
      let _this = this

      uploadPic(formData).then(response => {
      uploadPic1(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
        _this.fileList2.push({name:response.data.fileName, url:response.data.url})
        console("ok")
@@ -753,7 +753,7 @@
      this.$refs.upload.clearFiles();
    //  this.uploading1 = true;
    //alert(100)
    uploadPic(formData).then(response => {
    uploadPic1(formData).then(response => {
     // alert(18)
     // let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
   //   _this.fileList1.push({name:response.data.fileName, url:response.data.url})
@@ -780,7 +780,7 @@
      this.$refs.upload1.clearFiles();
    //  this.uploading1 = true;
    //alert(100)
    uploadPic(formData).then(response => {
    uploadPic1(formData).then(response => {
     // alert(18)
     // let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
   //   _this.fileList1.push({name:response.data.fileName, url:response.data.url})