wangmengwei před 1 měsícem
rodič
revize
11adf809c1

+ 26 - 20
src/components/dragFileUpload/index.vue

@@ -25,18 +25,14 @@
 
     <!-- 文件列表 -->
     <transition-group ref="uploadFileList" class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
-      <li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
-        <el-link :href="`${baseUrl}${file.url}`" :underline="false" target="_blank">
-          <div class="files">
-            <img  src="@/assets/images/project/file.png"/>
-            {{ getFileName(file.name) }}
-          </div>
-          <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
-        </el-link>
-        <div class="ele-upload-list__item-content-action">
-          <el-link :underline="false" @click="handleDelete(index)" type="danger" v-if="!disabled">删除</el-link>
-        </div>
-      </li>
+     <li :key="file.fjUrl" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
+       <el-link :href="`${baseUrl}${file.fjUrl}`" :underline="false" target="_blank">
+         <span class="el-icon-document"> {{ getFileName(file.fjName) }} </span>
+       </el-link>
+       <div class="ele-upload-list__item-content-action">
+         <el-link :underline="false" @click="handleDelete(index)" type="danger" v-if="!disabled">删除</el-link>
+       </div>
+     </li>
     </transition-group>
   </div>
 </template>
@@ -59,6 +55,9 @@ export default {
     data: {
       type: Object
     },
+	datam:{
+		type: Object
+	},
     // 数量限制
     limit: {
       type: Number,
@@ -72,7 +71,7 @@ export default {
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", "pdf","png","jpeg","jpg","zip"]
+      default: () => ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", "pdf","png","jpg"]
     },
     // 是否显示提示
     isShowTip: {
@@ -99,10 +98,15 @@ export default {
       headers: {
         Authorization: "Bearer " + getToken(),
       },
-      fileLists: [],
-      fileList: [{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}]
+      fileList: [],
+	  slgegse:''
     }
   },
+  created() {
+  	this.slgegse = this.fileType.join(',')
+	// this.data = {"xmbh": this.datam.xmbh,  "fileName": this.datam.fileName} 
+	console.log(this.datam)
+  },
   mounted() {
     if (this.drag && !this.disabled) {
       this.$nextTick(() => {
@@ -128,7 +132,7 @@ export default {
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
             if (typeof item === "string") {
-              item = { name: item, url: item }
+              item = { fjName: item, fjUrl: item }
             }
             item.uid = item.uid || new Date().getTime() + temp++
             return item
@@ -190,8 +194,9 @@ export default {
     // 上传成功回调
     handleUploadSuccess(res, file) {
       if (res.code === 200) {
-        this.uploadList.push({ name: res.fileName, url: res.fileName })
-        this.uploadedSuccessfully()
+        this.uploadList.push({ fjName: res.newFileName, fjUrl: res.fileName, xmbh:this.datam.xmbh,bigType:this.datam.bigType,type:this.datam.type })
+        console.log(this.uploadList)
+		this.uploadedSuccessfully()
       } else {
         this.number--
         this.$modal.closeLoading()
@@ -211,7 +216,8 @@ export default {
         this.fileList = this.fileList.concat(this.uploadList)
         this.uploadList = []
         this.number = 0
-        this.$emit("input", this.listToString(this.fileList))
+        this.$emit("input", this.fileList)
+		console.log(this.fileList)
         this.$modal.closeLoading()
       }
     },
@@ -229,7 +235,7 @@ export default {
       let strs = ""
       separator = separator || ","
       for (let i in list) {
-        strs += list[i].url + separator
+        strs += list[i].fjUrl + separator
       }
       return strs != '' ? strs.substr(0, strs.length - 1) : ''
     }

+ 15 - 26
src/views/project/fourthInfoForm.vue

@@ -93,7 +93,7 @@
                   <el-table-column align="center" prop="cz" label="当月累计产值(万元)"  > </el-table-column>
                   <el-table-column align="center" prop="sjss" label="当月实缴税收(万元)"  > </el-table-column>
                   <el-table-column align="center" prop="hdl" label="当月累计用电(万千瓦时)"  > </el-table-column>
-                  <el-table-column align="center" prop="time" label="上报时间" >
+                  <el-table-column align="center" prop="createTime" label="上报时间" >
                   </el-table-column>
                 </el-table>
           </div>
@@ -235,33 +235,21 @@ export default {
 	 this.info.xsfqlist = []
 	 this.info.cwbblist = []
 	 this.info.tjbblist = []
-	  if(this.$route.query.id == -1){
-		  // this.info.begitcTimenTime = null
-		  // this.info.rgTime = null
-		  // this.info.wycznh = null
-		  let that = this
-		  setTimeout(function()  {
-		   let sngsenhgt = that.info.xmbh
-		   that.jyzhp.xmbh = sngsenhgt
-		   that.xsht.xmbh = sngsenhgt
-		   that.xsfp.xmbh = sngsenhgt
-		   that.cwbb.xmbh = sngsenhgt
-		   that.tjbb.xmbh = sngsenhgt
-		   that.issfe = true
-		     console.log(sngsenhgt)
-		     }, 4000);
+	 let that = this
+	 setTimeout(function()  {
+	  let sngsenhgt = that.info.xmbh
+	  that.jyzhp.xmbh = sngsenhgt
+	  that.xsht.xmbh = sngsenhgt
+	  that.xsfp.xmbh = sngsenhgt
+	  that.cwbb.xmbh = sngsenhgt
+	  that.tjbb.xmbh = sngsenhgt
+	  that.issfe = true
+	    console.log(sngsenhgt)
+	    }, 4000);
+	  if(this.info.id == -1){
 		  // 新增
 		// this.getList()
 	  }else{
-		  let sngsenhgt = this.$route.query.bh
-		  this.info.xmbh = this.$route.query.bh
-		  this.info.xmId = this.$route.query.id
-		  this.jyzhp.xmbh = sngsenhgt
-		  this.xsht.xmbh = sngsenhgt
-		  this.xsfp.xmbh = sngsenhgt
-		  this.cwbb.xmbh = sngsenhgt
-		  this.tjbb.xmbh = sngsenhgt
-		  this.issfe = true
 		  // 修改
 		  this.getList()
 		  
@@ -294,6 +282,7 @@ export default {
 	 }
 	 // console.log(this.form)
 	 this.form.xmbh = this.info.xmbh
+	 // this.form.tcxxId =  1
 	 // return
 	 addMonth(this.form).then(response => {
 	   this.$modal.msgSuccess("新增成功")
@@ -332,7 +321,7 @@ export default {
        } else {
          addTcxx(this.info).then(response => {
            this.$modal.msgSuccess("新增成功")
-		   this.form.tcxxId =  response.tcxxId
+		   this.form.tcxxId =  response.data
            // this.open = false
 		   // this.$router.go(-1)
            // this.getList()

+ 75 - 27
src/views/project/thirdInfoForm.vue

@@ -53,6 +53,7 @@
         </div>
         <div class="ftab flexc">
           <div class="line"></div>上报项目建设进展情况
+		  <span style="color: red; font-size: 12px;">(请先保存建设信息在填写上报项目建设进展情况)</span>
           <div class="flex1"></div>
           <el-button type="primary" plain class="upbox" plain >
             提交
@@ -61,7 +62,7 @@
        <div class="rowbox">
           <el-row :gutter="22">
             <el-col :span="24" style="margin-bottom: 12px;">
-              <drag-file-upload v-model="form.desc"/>
+              <drag-file-upload v-model="form.jylist" :datam="jyzhp"  :data="jyzhp"/>
             </el-col>
             <el-col :span="12">
               <el-form-item label="建设进展情况" prop="jzqk">
@@ -73,11 +74,7 @@
                 <el-input type="textarea" placeholder="输入存在的问题…" v-model="form.czwt"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="实际到位资金(万元)" prop="tableName">
-                <el-input placeholder="实际到位资金(万元)" v-model="form.czwt" />
-              </el-form-item>
-            </el-col>
+            
             <el-col :span="6">
               <el-form-item label="土地出让金总额(万元)" prop="tdcrzje">
                 <el-input placeholder="请输入土地出让金总额" v-model="form.tdcrzje" />
@@ -90,7 +87,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="设备清单金额(万元)" prop="className">
-                <el-input placeholder="请输入设备清单金额" v-model="form.czwt" />
+                <el-input placeholder="请输入设备清单金额" v-model="form.sbqd" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -103,6 +100,11 @@
                 <el-input placeholder="请输入设备合同金额" v-model="form.htje" />
               </el-form-item>
             </el-col>
+			<el-col :span="6">
+			  <el-form-item label="实际到位资金(万元)" prop="tableName">
+			    <el-input placeholder="实际到位资金(万元)" v-model="form.czwt" />
+			  </el-form-item>
+			</el-col>
           </el-row>
         </div>
         <div class="ftab flexc" style="padding-top: 7px;">
@@ -111,7 +113,7 @@
         <div class="rowbox" style="width: 100%;overflow: hidden;">
             <el-table :max-height="213"  :data="tableDataa" border style="width: 100%;margin-bottom: 15px;">
                 <el-table-column align="center" prop="jzqk" label="建设进展情况"  > </el-table-column>
-                <el-table-column align="center" prop="czwt" label="存在的问题" > </el-table-column>
+                <el-table-column align="center" prop="sbqd" label="存在的问题" > </el-table-column>
 				<el-table-column align="center" prop="fjlx" label="实际到位资金(万元)"  > </el-table-column>
 				<el-table-column align="center" prop="cftrje" label="厂房投入金额(万元)" > </el-table-column>
 				<el-table-column align="center" prop="sbqd" label="设备清单金额(万元)"  > </el-table-column>
@@ -151,7 +153,7 @@
                   <template slot-scope="scope">
                    <div class="flexcc">
                      <div class="btna flexc coa">
-            		    <fileUploadt  v-model="info.jylist" :datam="jyzhp"  :data="jyzhp"  v-if="scope.row.index == 0"/>
+            		    <!-- <fileUploadt  v-model="info.jylist" :datam="jyzhp"  :data="jyzhp"  v-if="scope.row.index == 0"/> -->
             			 <fileUploadt  v-model="info.xshtlist" :datam="xsht" :data="xsht"  v-if="(scope.row.index  == 1 && issfe)" />
             			  <fileUploadt  v-model="info.xsfqlist" :datam="xsfp"  :data="xsfp" v-if="(scope.row.index  == 2 && issfe)" />
             			   <fileUploadt  v-model="info.cwbblist" :datam="cwbb"  :data="cwbb" v-if="(scope.row.index  == 3 && issfe)" />
@@ -166,7 +168,7 @@
     </el-form>
     <div class="flexcc pt7">
         <!-- <el-button type="primary" plain>暂存</el-button> -->
-         <el-button type="primary"  style="margin-left: 26px;">提交</el-button>
+         <el-button type="primary"  style="margin-left: 26px;" @click="submitForm">提交</el-button>
     </div>
 	
  
@@ -195,11 +197,7 @@ export default {
                 value: '选项2',
                 label: '双皮奶'
               }],
-      tableData: [{
-                fjlx: '项目每月建设照片',
-                index:0,
-                time: '2025-06-16 16:57',
-      },
+      tableData: [
       {
                 fjlx: '设备清单',
                 index:1,
@@ -235,18 +233,11 @@ export default {
               dialogFormVisible:false,
               input:'',
       rules: {
-        // tableName: [
-        //   { required: true, message: "请输入表名称", trigger: "blur" }
-        // ],
-        // tableComment: [
-        //   { required: true, message: "请输入表描述", trigger: "blur" }
-        // ],
-        // className: [
-        //   { required: true, message: "请输入实体类名称", trigger: "blur" }
-        // ],
-        // functionAuthor: [
-        //   { required: true, message: "请输入作者", trigger: "blur" }
-        // ]
+        beginTime: [
+          { required: true, message: "请输入", trigger: "blur" }
+        ],
+        
+        
       },
 	  jyzhp:{
 	  		  fileName:'项目每月建设照片',
@@ -289,6 +280,63 @@ export default {
 	      this.loading = false
 	    })
 	  },
+	  // 每月更新提交
+	  handleAdd(){
+	  	 if(this.form.tcxxYear == null){
+	  		this.$message.error('请填写年度'); 
+	  		return
+	  	 }
+	  	 if(this.form.tcxxMonth == null){
+	  	 		this.$message.error('请填写月份'); 
+	  			return
+	  	 }
+	  	 this.form.xmbh = this.info.xmbh
+	  	 addJdqk(this.form).then(response => {
+	  	   this.$modal.msgSuccess("新增成功")
+	  	   this.open = false
+	  	   this.getList()
+	  	 })
+	  },
+	  /** 提交按钮 */
+	  submitForm: function() {
+	    this.$refs["basicInfoForm"].validate(valid => {
+	      if (valid) {
+	  		 this.info.zsyzFjList = []
+	  		 if(this.info.jylist.length !=0){
+	  			 this.info.zsyzFjList = this.info.zsyzFjList.concat(this.info.jylist )  
+	  		 }
+	  		 if(this.info.xshtlist.length !=0){
+	  			 this.info.zsyzFjList = this.info.zsyzFjList.concat(this.info.xshtlist )
+	  		 }
+	  		 if(this.info.xsfqlist.length !=0){
+	  		 	 this.info.zsyzFjList = this.info.zsyzFjList.concat(this.info.xsfqlist )		 
+	  		 }
+	  		 if(this.info.cwbblist.length !=0){
+	  		 	 this.info.zsyzFjList = this.info.zsyzFjList.concat(this.info.cwbblist )		 
+	  		 }
+	  		 if(this.info.tjbblist.length !=0){
+	  		 	 this.info.zsyzFjList = this.info.zsyzFjList.concat(this.info.tjbblist )		 
+	  		 }
+	  		 console.log(this.info.zsyzFjList,this.info,6)
+	  		 // return
+	        if (this.info.xmId != undefined) {
+	          updateJsxx(this.info).then(response => {
+	            this.$modal.msgSuccess("修改成功")
+	            this.open = false
+				// this.$router.go(-1)
+	          })
+	        } else {
+	          addJsxx(this.info).then(response => {
+	            this.$modal.msgSuccess("新增成功")
+	  		   this.form.jsxxId =  response.data
+	            // this.open = false
+	  		   // this.$router.go(-1)
+	            // this.getList()
+	          })
+	        }
+	      }
+	    })
+	  },
   }
 }
 </script>