提交

src/api/system/user.js

@@ -96,7 +96,7 @@ export function updateUserPwd(oldPassword, newPassword) {
   return request({
     url: '/system/user/profile/updatePwd',
     method: 'post',
-    params: data
+    data: data
   })
 }
 

src/components/FileUploadt/index.vue

@@ -200,7 +200,7 @@ export default {
     // 上传成功回调
     handleUploadSuccess(res, file) {
       if (res.code === 200) {
-        this.uploadList.push({status:'success', fjName: res.newFileName, fjUrl: res.fileName, xmbh:this.datam.xmbh,bigType:this.datam.bigType,type:this.datam.type })
+        this.uploadList.push({status:'success', fjName: res.newFileName, fjUrl: res.fileName, xmbh:this.data.xmbh,bigType:this.data.bigType,type:this.data.type })
         // console.log(this.uploadList)
 		this.uploadedSuccessfully()
       } else {

src/views/project/add.vue

@@ -24,7 +24,7 @@
                   <span>签约环节
                   </span>
                 </div>
-                <first-info-form v-if="activeName=='first'" ref="firstInfo" :cylbOptions="cylbOptions" :qybjOptions="qybjOptions" :info="qyxxinfo" @getSubmit="getSubmitqxyy" :xmbh="xmbh"></first-info-form>
+                <first-info-form @handeqi = "handeqi" v-if="activeName=='first'" ref="firstInfo" :cylbOptions="cylbOptions" :qybjOptions="qybjOptions" :info="qyxxinfo" @getSubmit="getSubmitqxyy" :xmbh="xmbh"></first-info-form>
               </el-tab-pane>
               <el-tab-pane  name="second" :disabled="isdisabled">
                 <div slot="label" class="tab flexc" @click="handleClicka">
@@ -33,7 +33,7 @@
                   <span>开工环节
                   </span>
                 </div>
-                <second-info-form v-if="activeName=='second'" ref="secondInfo" :xmbh="xmbh" :info="kghjinfo" @getSubmit="getKgxxDetail"></second-info-form>
+                <second-info-form @handeqi = "handeqi" v-if="activeName=='second'" ref="secondInfo" :xmbh="xmbh" :info="kghjinfo" @getSubmit="getKgxxDetail"></second-info-form>
               </el-tab-pane>
               <el-tab-pane  name="third" :disabled="isdisabled">
                 <div slot="label" class="tab flexc" @click="handleClicka">
@@ -42,7 +42,7 @@
                   <span>建设环节
                   </span>
                 </div>
-                <third-info-form v-if="activeName=='third'" ref="thirdInfo" :info="jshjinfo" @getSubmit="getJsxxDetail"></third-info-form>
+                <third-info-form @handeqi = "handeqi" v-if="activeName=='third'" ref="thirdInfo" :info="jshjinfo"></third-info-form>
                 </el-tab-pane>
               <el-tab-pane  name="fourth" :disabled="isdisabled">
                 <div slot="label" class="tab flexc" @click="handleClicka">
@@ -51,10 +51,9 @@
                   <span>投产环节
                   </span>
                 </div>
-                <fourth-info-form v-if="activeName=='fourth' " ref="fourthInfo" :info="tchjinfo" @getSubmit="getTcxxDetail"></fourth-info-form>
+                <fourth-info-form @handeqi = "handeqi" v-if="activeName=='fourth' " ref="fourthInfo" :info="tchjinfo"></fourth-info-form>
                 </el-tab-pane>
             </el-tabs>
-
             <div class="btns flexcc" v-if="progress == 4">
               <el-button v-hasPermi="['zhaoshangV3:qyxx:edit']" type="success" size="small" @click="hunpl">完成</el-button>
             </div>
@@ -83,12 +82,12 @@
     data() {
       return{
         step:[
-          {tit:'立项',desc:[]},
-          {tit:'签约',desc:[]},
-          {tit:'开工',desc:[]},
-          {tit:'建设',desc:[]},
-          {tit:'投产',desc:[]},
-          {tit:'完成',desc:[]},
+          {tit:'立项',desc:[{tit:'新建'},{tit:'审核'}]},
+          {tit:'签约',desc:[{tit:'签约双方信息'},{tit:'签约项目信息'},{tit:'附件上传'}]},
+          {tit:'开工',desc:[{tit:'开工前相关手续办理'},{tit:'开工信息'},{tit:'附件上传'}]},
+          {tit:'建设',desc:[{tit:'建设信息'},{tit:'附件上传'}]},
+          {tit:'投产',desc:[{tit:'投产信息'},{tit:'附件上传'}]},
+          {tit:'完成',desc:[{tit:'提交'},{tit:'审核'}]},
         ],
         activeName:'first',
         // 表详细信息
@@ -157,6 +156,7 @@
       }
     },
     created() {
+		this.activeName = this.$route.query.activeName
       this.getDicts("industry_type").then(response => {
         this.cylbOptions = response.data;
       });
@@ -189,7 +189,17 @@
         this.ptype='edit'
         this.xmId=this.$route.query.id;
         this.xmbh=this.$route.query.bh;
-        this.getQyxxDetail()
+		this.getQyxxDetail()
+		if(this.activeName=='first'){
+		  // this.getQyxxDetail()
+		}else if(this.activeName=='second'){
+		  this.getKgxxDetail()
+		}else if(this.activeName=='third'){
+		  this.getJsxxDetail()
+		}else if(this.activeName=='fourth'){
+		  this.getTcxxDetail()
+		}
+        
       }else{
         this.ptype='add';
         // this.xmbh='ZS20250714102';
@@ -221,7 +231,9 @@
         }
       },
       handleClick(e){
+		  console.log(e)
         var name=e.name;
+		console.log(name)
         if(name=='first'){
           this.getQyxxDetail()
         }else if(name=='second'){
@@ -231,7 +243,28 @@
         }else if(name=='fourth'){
           this.getTcxxDetail()
         }
+		this.activeName = e.name
       },
+	  // 点击切换页面\
+	  handeqi(e){
+		  this.handleClick(e)
+		  if(e.name == 'third' || e.name == 'fourth'){
+			setTimeout(function() {
+				window.scrollTo({
+				    top: 250,
+				    behavior: "smooth"
+				});
+			}, 1000)    
+		  }else{
+			setTimeout(function() {
+				window.scrollTo({
+				    top: 0,
+				    behavior: "smooth"
+				});
+			}, 1000)  
+		  }
+		
+	  },
       getXmbh(){
         getXmbh().then(res=>{
           this.xmbh=res.data;
@@ -365,6 +398,9 @@
       }
       &.finish{
          .line{background-color: #1890FF !important;}
+         .list{
+           .cir{background: #00A854;}
+         }
       }
       &:last-child{
         .line{display: none !important;}

src/views/project/boxlist.vue

@@ -15,7 +15,10 @@
            </div>
             <div class="flex1"></div>
 			<div @click="hunge(item)" style="cursor: pointer; font-weight: 500;font-size: 14px;color: #00A854;">
-			 <img src="@/assets/images/icon_yqyd_lb_xg.png" alt="" style="margin-right: 5px;">	修改
+			 	修改
+			</div>
+			<div @click="handleDelete(item)" style="cursor: pointer; font-weight: 500;font-size: 14px;color: red; margin-left: 5px;">
+			 	删除
 			</div>
             
         </div>
@@ -112,6 +115,7 @@
 
 <script>
 import { number } from 'echarts'
+import { listQyxx, getQyxx, delQyxx, addQyxx, updateQyxx } from "@/api/zhaoshang/qyxx"
   export default{
 	  dicts: ['project_schedule', ],
     props: {
@@ -123,6 +127,10 @@ import { number } from 'echarts'
         type: String,
         default: ''
       },
+	  actin: {
+	    type: String,
+	    default: ''
+	  },
 	  datalist: {
 	    type: Object,
 	    default: null
@@ -134,7 +142,7 @@ import { number } from 'echarts'
     },
 	created() {
 		console.log(8)
-		console.log(this.datalist,this.type,7)
+		console.log(this.datalist,this.type,7,this.actin)
 	},
 	methods:{
 		hunge(row){
@@ -142,10 +150,19 @@ import { number } from 'echarts'
 			  path: '/zhaoshang/add',
 			  query: {
 			  	'id':row.xmId,
-				'bh':row.xmbh
+				'bh':row.xmbh,
+				'activeName':this.actin
 			  }
 			})
-		}
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+		  const tzfkIds = row.qyxxId 
+		  delQyxx(tzfkIds).then(response => {
+		    this.$modal.msgSuccess("删除成功")
+			this.$parent.getList();
+		  })
+		},
 	}
   }
 </script>

src/views/project/firstInfoForm.vue

@@ -277,6 +277,7 @@
     <div class="flexcc pt7">
         <!-- <el-button type="primary" plain>暂存</el-button> -->
          <el-button type="primary" v-hasPermi="['zhaoshangV3:qyxx:add']" @click="getSubmit" style="margin-left: 26px;">提交</el-button>
+		 <el-button v-hasPermi="['zhaoshangV3:tcxx:edit']" plain type="primary" style="margin-left: 26px;" @click="cldke">取消</el-button>
     </div>
   </div>
 
@@ -348,6 +349,9 @@ export default {
     // })
   },
   methods:{
+	  cldke(){
+	  	this.$router.go(-1)
+	  },
     getSubmit(){
       console.log(this.info)
       this.$refs.basicInfoForm.validate(valid => {
@@ -367,6 +371,9 @@ export default {
               updateQyxx(params).then(res=>{
                 if(res.code==200){
                   this.$message.success('修改成功');
+				  let sngsej={name:'second'}
+				  this.$emit('handeqi',sngsej)
+				  
                 }
               })
             }else{
@@ -374,6 +381,8 @@ export default {
                 if(res.code==200){
                   this.$message.success('保存成功');
                   this.$emit("getSubmit",res.data)
+				  let sngsej={name:'second'}
+				  this.$emit('handeqi',sngsej)
                 }
               })
             }

src/views/project/fourthInfoForm.vue

@@ -6,6 +6,7 @@
 					<img class="timg flex0" src="@/assets/images/project/tabtit.png" />
 					<div class="flex1 tit">投产信息</div>
 					<el-button type="primary" plain @click="submitForm">保存</el-button>
+					<el-button type="primary" plain @click="cldke">取消</el-button>
 				</div>
 				<div class="rowbox">
 					<el-row :gutter="22">
@@ -117,15 +118,15 @@
 							<template slot-scope="scope">
 								<div class="flexcc">
 									<div class="btna flexc coa">
-										<fileUploadt v-model="jylist" :datam="jyzhp" :data="jyzhp"
+										<fileUploadt v-model="jylist"  :data="jyzhp"
 											v-if="scope.row.index == 0" />
-										<fileUploadt v-model="xshtlist" :datam="xsht" :data="xsht"
+										<fileUploadt v-model="xshtlist"  :data="xsht"
 											v-if="(scope.row.index  == 1 && issfe)" />
-										<fileUploadt v-model="xsfqlist" :datam="xsfp" :data="xsfp"
+										<fileUploadt v-model="xsfqlist"  :data="xsfp"
 											v-if="(scope.row.index  == 2 && issfe)" />
-										<fileUploadt v-model="cwbblist" :datam="cwbb" :data="cwbb"
+										<fileUploadt v-model="cwbblist"  :data="cwbb"
 											v-if="(scope.row.index  == 3 && issfe)" />
-										<fileUploadt v-model="tjbblist" :datam="tjbb" :data="tjbb"
+										<fileUploadt v-model="tjbblist"  :data="tjbb"
 											v-if="(scope.row.index  == 4 && issfe)" />
 									</div>
 								</div>
@@ -139,6 +140,7 @@
 		<div class="flexcc pt7">
 			<!-- <el-button type="primary" plain>暂存</el-button> -->
 			<el-button v-hasPermi="['zhaoshangV3:tcxx:edit']" type="primary" style="margin-left: 26px;" @click="submitForm">提交</el-button>
+			<el-button v-hasPermi="['zhaoshangV3:tcxx:edit']" plain type="primary" style="margin-left: 26px;" @click="cldke">取消</el-button>
 		</div>
 	</div>
 
@@ -258,14 +260,13 @@
 			}
 		},
 		watch: {
-			info: {
-				handler(newVal, oldVal) {
-					// 在这里处理dataMsg变化后的逻辑
-					// console.log(this.info)
-					this.getshui()
-
-				},
-				immediate: true // 立即执行一次
+			secondChange() {
+				this.getshui()
+			}
+		},
+		computed: {
+			secondChange() {
+				return this.info.xmbh
 			}
 		},
 		created() {
@@ -277,12 +278,7 @@
 		methods: {
 			// 回显
 			getshui() {
-				this.jylist = []
-				this.xshtlist = []
-				this.xsfqlist = []
-				this.cwbblist = []
-				this.tjbblist = []
-				console.log(this.info)
+				// console.log(this.info)
 				let that = this
 				setTimeout(function() {
 					let sngsenhgt = that.info.xmbh
@@ -291,16 +287,16 @@
 					that.xsfp.xmbh = sngsenhgt
 					that.cwbb.xmbh = sngsenhgt
 					that.tjbb.xmbh = sngsenhgt
+					that.jylist = []
+					that.xshtlist = []
+					that.xsfqlist = []
+					that.cwbblist = []
+					that.tjbblist = []
 					that.issfe = true
 					if (that.info.id == -1) {
 						// 新增
 						// this.getList()
 					} else {
-						that.jylist = []
-						that.xshtlist = []
-						that.xsfqlist = []
-						that.cwbblist = []
-						that.tjbblist = []
 						// 修改
 						if (that.info.zsyzFjList.length != 0) {
 							that.info.zsyzFjList.filter(rou => {
@@ -338,6 +334,7 @@
 				let sgnsegse = {
 					xmbh: this.info.xmbh
 				}
+				
 				listMonth(sgnsegse).then(response => {
 					this.tableDataa = response.rows
 					this.total = response.total
@@ -357,6 +354,10 @@
 				// console.log(this.form)
 				this.form.tcxxId = this.info.tcxxId
 				this.form.xmbh = this.info.xmbh
+				if(this.form.tcxxId == null || this.form.tcxxId == undefined){
+					this.$message.error('请先填写投产信息');
+					return
+				}
 				// this.form.tcxxId =  1
 				// return
 				if (this.form.tcxxMonthId != undefined) {
@@ -408,6 +409,9 @@
 					this.getList()
 				})
 			},
+			cldke(){
+				this.$router.go(-1)
+			},
 			/** 提交按钮 */
 			submitForm: function() {
 				this.$refs["basicInfoForm"].validate(valid => {
@@ -435,6 +439,8 @@
 							updateTcxx(this.info).then(response => {
 								this.$modal.msgSuccess("修改成功")
 								this.open = false
+								let sngsej={name:'fourth'}
+								this.$emit('handeqi',sngsej)
 								// this.getList()
 							})
 						} else {
@@ -442,10 +448,10 @@
 								this.$modal.msgSuccess("新增成功")
 								this.form.tcxxId = response.data
 								this.info.tcxxId = response.data
-                this.$emit("getSubmit",response.data)
-								// this.open = false
-								// this.$router.go(-1)
-								// this.getList()
+								this.info.id = response.data
+                               this.$emit("getSubmit",response.data)
+							   let sngsej={name:'fourth'}
+							   this.$emit('handeqi',sngsej)
 							})
 						}
 					}

src/views/project/list.vue

@@ -97,7 +97,7 @@
             <el-button type="success"  class="cbbtn" size="small" @click="handleExport">导出</el-button>
           </div>
 		  <div class="blist" >
-		    <boxlist v-if="isgse" type="xmgl" :datalist="liesse"></boxlist>
+		    <boxlist @getList="getList" v-if="isgse" type="xmgl" :actin="activeName" :datalist="liesse"></boxlist>
 		  </div>
 		  
           <Pagination
@@ -281,6 +281,7 @@ export default {
 		  path: '/zhaoshang/add',
 		  query: {
 		  	'id':-1,
+			'activeName':'first'
 		  }
 		})
 	},

src/views/project/secondInfoForm.vue

@@ -108,6 +108,7 @@
     <div class="flexcc pt7">
         <!-- <el-button type="primary" plain>暂存</el-button> -->
          <el-button type="primary" v-hasPermi="['zhaoshangV3:kgxx:add']" @click="getSubmit"  style="margin-left: 26px;">提交</el-button>
+		 <el-button v-hasPermi="['zhaoshangV3:tcxx:edit']" plain type="primary" style="margin-left: 26px;" @click="cldke">取消</el-button>
     </div>
   </div>
 
@@ -185,6 +186,9 @@ export default {
     }
   },
   methods:{
+	  cldke(){
+	  	this.$router.go(-1)
+	  },
     getSubmit(){
       this.$refs.basicInfoForm.validate(valid => {
           if(valid){
@@ -195,6 +199,8 @@ export default {
               updateKgxx(params).then(res=>{
                 if(res.code==200){
                   this.$message.success('修改成功');
+				  let sngsej={name:'third'}
+				  this.$emit('handeqi',sngsej)
                 }
               })
             }else{
@@ -202,6 +208,8 @@ export default {
                 if(res.code==200){
                   this.$emit("getSubmit",res.data)
                   this.$message.success('保存成功');
+				  let sngsej={name:'third'}
+				  this.$emit('handeqi',sngsej)
                 }
               })
             }

src/views/project/thirdInfoForm.vue

@@ -1,552 +1,683 @@
 <template>
-  <div class="infobox">
-    <el-form ref="basicInfoForm" label-position="top" :model="info" :rules="rules" >
-      <div class="fomebox">
-        <div class="ftop flexc">
-          <img class="timg flex0" src="@/assets/images/project/tabtit.png"/>
-          <div class="flex1 tit">建设时间</div>
-          <!-- <el-button type="primary" plain>保存</el-button> -->
-        </div>
-        <div class="rowbox">
-          <el-row  :gutter="22">
-            <el-col :span="8">
-              <el-form-item label="建设起止时间" prop="beginTime">
-                <el-date-picker
-				@change="nsewe"
-				style="width: 100%;"
-                      v-model="timete"
-                      type="daterange"
-					  value-format="yyyy-MM-dd"
-                      range-separator="至"
-                      start-placeholder="请选择开始时间"
-                      end-placeholder="请选择结束时间">
-                    </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="竣工时间" prop="jgTime">
-                <el-date-picker
-                      v-model="info.jgTime"
-                      type="date"
-					  value-format="yyyy-MM-dd"
-                      placeholder="年 / 月 / 日">
-                    </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="入统时间" prop="rtTime">
-                <el-date-picker
-                      v-model="info.rtTime"
-                      type="date"
-					  value-format="yyyy-MM-dd"
-                      placeholder="年 / 月 / 日">
-                    </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-      </div>
-      <div class="fomebox">
-        <div class="ftop flexc">
-          <img class="timg flex0" src="@/assets/images/project/tabtit.png"/>
-          <div class="flex1 tit">建设进度跟踪<span style="color: red; font-size: 12px;">(请先保存建设信息在填写上报项目建设进展情况)</span></div>
-          <!-- <el-button type="primary" plain>保存</el-button> -->
-        </div>
-        <div class="ftab flexc">
-          <div class="line"></div>上报项目建设进展情况
-          <div class="flex1"></div>
-          <el-button type="primary" v-hasPermi="['zhaoshangV3:jsxx:add']" @click="handleAdd"  plain class="upbox" plain >
-            提交
-          </el-button>
-        </div>
-       <div class="rowbox">
-          <el-row :gutter="22">
-            <el-col :span="24" style="margin-bottom: 12px;">
-              <drag-file-upload v-model="form.jsPhoto" :datam="jyzhp"  :data="jyzhp"/>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="建设进展情况" prop="jzqk">
-                <el-input type="textarea" placeholder="输入项目进展情况…" v-model="form.jzqk" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="存在的问题" prop="czwt">
-                <el-input type="textarea" placeholder="输入存在的问题…" v-model="form.czwt" clearable></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="土地出让金总额(万元)" prop="tdcrzje">
-                <el-input placeholder="请输入土地出让金总额" v-model="form.tdcrzje"  clearable/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="厂房投入金额(万元)" prop="cftrje">
-                <el-input placeholder="请输入厂房投入金额" v-model="form.cftrje"  clearable/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="设备清单金额(万元)" prop="className">
-                <el-input placeholder="请输入设备清单金额" v-model="form.sbqd"  clearable/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="发票金额(万元)" prop="fpje">
-                <el-input placeholder="请输入发票金额" v-model="form.fpje"  clearable/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="设备合同金额(万元)" prop="htje">
-                <el-input placeholder="请输入设备合同金额" v-model="form.htje"  clearable/>
-              </el-form-item>
-            </el-col>
-			<!-- <el-col :span="6">
+	<div class="infobox">
+		<el-form ref="basicInfoForm" label-position="top" :model="info" :rules="rules">
+			<div class="fomebox">
+				<div class="ftop flexc">
+					<img class="timg flex0" src="@/assets/images/project/tabtit.png" />
+					<div class="flex1 tit">建设时间</div>
+					<!-- <el-button type="primary" plain>保存</el-button> -->
+				</div>
+				<div class="rowbox">
+					<el-row :gutter="22">
+						<el-col :span="8">
+							<el-form-item label="建设起止时间" prop="beginTime">
+								<el-date-picker @change="nsewe" style="width: 100%;" v-model="timete" type="daterange"
+									value-format="yyyy-MM-dd" range-separator="至" start-placeholder="请选择开始时间"
+									end-placeholder="请选择结束时间">
+								</el-date-picker>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="竣工时间" prop="jgTime">
+								<el-date-picker v-model="info.jgTime" type="date" value-format="yyyy-MM-dd"
+									placeholder="年 / 月 / 日">
+								</el-date-picker>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="入统时间" prop="rtTime">
+								<el-date-picker v-model="info.rtTime" type="date" value-format="yyyy-MM-dd"
+									placeholder="年 / 月 / 日">
+								</el-date-picker>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</div>
+			</div>
+			<div class="fomebox">
+				<div class="ftop flexc">
+					<img class="timg flex0" src="@/assets/images/project/tabtit.png" />
+					<div class="flex1 tit">建设进度跟踪<span
+							style="color: red; font-size: 12px;">(请先保存建设信息在填写上报项目建设进展情况)</span></div>
+					<!-- <el-button type="primary" plain>保存</el-button> -->
+				</div>
+				<div class="ftab flexc">
+					<div class="line"></div>上报项目建设进展情况
+					<div class="flex1"></div>
+					<el-button type="primary" v-hasPermi="['zhaoshangV3:jsxx:add']" @click="handleAdd" plain
+						class="upbox" plain>
+						提交
+					</el-button>
+				</div>
+				<div class="rowbox">
+					<el-row :gutter="22">
+						<el-col :span="24" style="margin-bottom: 12px;">
+							<drag-file-upload v-model="form.jsPhoto" :datam="jyzhp" :data="jyzhp" />
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="建设进展情况" prop="jzqk">
+								<el-input type="textarea" placeholder="输入项目进展情况…" v-model="form.jzqk"
+									clearable></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="存在的问题" prop="czwt">
+								<el-input type="textarea" placeholder="输入存在的问题…" v-model="form.czwt"
+									clearable></el-input>
+							</el-form-item>
+						</el-col>
+
+						<el-col :span="6">
+							<el-form-item label="土地出让金总额(万元)" prop="tdcrzje">
+								<el-input placeholder="请输入土地出让金总额" v-model="form.tdcrzje" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="厂房投入金额(万元)" prop="cftrje">
+								<el-input placeholder="请输入厂房投入金额" v-model="form.cftrje" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="设备清单金额(万元)" prop="className">
+								<el-input placeholder="请输入设备清单金额" v-model="form.sbqd" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="发票金额(万元)" prop="fpje">
+								<el-input placeholder="请输入发票金额" v-model="form.fpje" clearable />
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="设备合同金额(万元)" prop="htje">
+								<el-input placeholder="请输入设备合同金额" v-model="form.htje" clearable />
+							</el-form-item>
+						</el-col>
+						<!-- <el-col :span="6">
 			  <el-form-item label="实际到位资金(万元)" prop="tableName">
 			    <el-input placeholder="实际到位资金(万元)" v-model="form.czwt" clearable/>
 			  </el-form-item>
 			</el-col> -->
-          </el-row>
-        </div>
-        <div class="ftab flexc" style="padding-top: 7px;">
-          <div class="line"></div>每月项目建设进展情况
-        </div>
-        <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="shiji" label="实际到位资金"  > </el-table-column>
-				<el-table-column align="center" prop="tdcrzje" 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>
-				<el-table-column align="center" prop="fpje" label="发票金额" > </el-table-column>
-				<el-table-column align="center" prop="htje" label="设备合同金额" > </el-table-column>
-                <el-table-column align="center" label="操作" :width="120">
-                  <template slot-scope="scope">
-                   <div class="flexcc">
-                    <div v-hasPermi="['zhaoshangV3:jdqk:edit']"  class="btna  coa" style="padding: 0; margin-right: 3px;" @click="handleUpdate(scope.row)" >
-                       <div class="imgs">
-                       </div>修改
-                     </div>
-                     <div v-hasPermi="['zhaoshangV3:jdqk:remove']"  class="btna  cod" style="padding: 0; margin-left: 3px;" @click="handleDelete(scope.row)" >
-                       <div class="imgs"  >
-                       </div>删除
-                     </div>
-                   </div>
-                  </template>
-                </el-table-column>
-              </el-table>
-        </div>
-      </div>
-
-      <div class="fomebox">
-        <div class="ftop flexc">
-          <img class="timg flex0" src="@/assets/images/project/tabtit.png"/>
-          <div class="flex1 tit">上传附件</div>
-          <el-button type="primary" plain>保存</el-button>
-        </div>
-        <div class="rowbox">
-            <el-table  :data="tableData" border style="width: 100%;margin-bottom: 15px;">
-            	<el-table-column align="center" prop="index" label="序号" width="10%"></el-table-column>
-                <el-table-column align="center" prop="fjlx" label="附件类型"  width="30%"> </el-table-column>
-                <el-table-column align="center" label="操作" width="30%">
-                  <template slot-scope="scope">
-                   <div class="flexcc" v-if="issfe">
-                     <div class="btna flexc coa">
-            		    <!-- <fileUploadt  v-model="info.jylist" :datam="jyzhp"  :data="jyzhp"  v-if="scope.row.index == 0"/> -->
-            			 <fileUploadt  v-model="xshtlist" :datam="xsht" :data="xsht"  v-if="(scope.row.index  == 1 )" />
-            			  <fileUploadt  v-model="xsfqlist" :datam="xsfp"  :data="xsfp" v-if="(scope.row.index  == 2 )" />
-            			   <fileUploadt  v-model="cwbblist" :datam="cwbb"  :data="cwbb" v-if="(scope.row.index  == 3 )" />
-            			    <fileUploadt  v-model="tjbblist" :datam="tjbb"  :data="tjbb" v-if="(scope.row.index  == 4 )" />
-                     </div>
-                   </div>
-                  </template>
-                </el-table-column>
-              </el-table>
-        </div>
-      </div>
-    </el-form>
-    <div class="flexcc pt7">
-        <!-- <el-button type="primary" plain>暂存</el-button> -->
-         <el-button type="primary" v-hasPermi="['zhaoshangV3:jsxx:edit']"    style="margin-left: 26px;" @click="submitForm">提交</el-button>
-    </div>
-
-
-  </div>
+					</el-row>
+				</div>
+				<div class="ftab flexc" style="padding-top: 7px;">
+					<div class="line"></div>每月项目建设进展情况
+				</div>
+				<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="shiji" label="实际到位资金"> </el-table-column>
+						<el-table-column align="center" prop="tdcrzje" 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>
+						<el-table-column align="center" prop="fpje" label="发票金额"> </el-table-column>
+						<el-table-column align="center" prop="htje" label="设备合同金额"> </el-table-column>
+						<el-table-column align="center" label="操作" :width="120">
+							<template slot-scope="scope">
+								<div class="flexcc">
+									<div v-hasPermi="['zhaoshangV3:jdqk:edit']" class="btna  coa"
+										style="padding: 0; margin-right: 3px;" @click="handleUpdate(scope.row)">
+										<div class="imgs">
+										</div>修改
+									</div>
+									<div v-hasPermi="['zhaoshangV3:jdqk:remove']" class="btna  cod"
+										style="padding: 0; margin-left: 3px;" @click="handleDelete(scope.row)">
+										<div class="imgs">
+										</div>删除
+									</div>
+								</div>
+							</template>
+						</el-table-column>
+					</el-table>
+				</div>
+			</div>
+
+			<div class="fomebox">
+				<div class="ftop flexc">
+					<img class="timg flex0" src="@/assets/images/project/tabtit.png" />
+					<div class="flex1 tit">上传附件</div>
+					<el-button type="primary" plain>保存</el-button>
+				</div>
+				<div class="rowbox">
+					<el-table :data="tableData" border style="width: 100%;margin-bottom: 15px;">
+						<el-table-column align="center" prop="index" label="序号" width="10%"></el-table-column>
+						<el-table-column align="center" prop="fjlx" label="附件类型" width="30%"> </el-table-column>
+						<el-table-column align="center" label="操作" width="30%">
+							<template slot-scope="scope">
+								<div class="flexcc" v-if="issfe">
+									<div class="btna flexc coa">
+										<!-- <fileUploadt  v-model="info.jylist" :datam="jyzhp"  :data="jyzhp"  v-if="scope.row.index == 0"/> -->
+										<fileUploadt v-model="xshtlist"  :data="xsht"
+											v-if="(scope.row.index  == 1 )" />
+										<fileUploadt v-model="xsfqlist"  :data="xsfp"
+											v-if="(scope.row.index  == 2 )" />
+										<fileUploadt v-model="cwbblist"  :data="cwbb"
+											v-if="(scope.row.index  == 3 )" />
+										<fileUploadt v-model="tjbblist"  :data="tjbb"
+											v-if="(scope.row.index  == 4 )" />
+									</div>
+								</div>
+							</template>
+						</el-table-column>
+					</el-table>
+				</div>
+			</div>
+		</el-form>
+		<div class="flexcc pt7">
+			<!-- <el-button type="primary" plain>暂存</el-button> -->
+			<el-button type="primary" v-hasPermi="['zhaoshangV3:jsxx:edit']" style="margin-left: 26px;"
+				@click="submitForm">提交</el-button>
+				<el-button v-hasPermi="['zhaoshangV3:tcxx:edit']" plain type="primary" style="margin-left: 26px;" @click="cldke">取消</el-button>
+		</div>
+
+
+	</div>
 
 </template>
 
 <script>
-import { listJdqk, getJdqk, delJdqk, addJdqk, updateJdqk } from "@/api/zhaoshang/jdqk"
-import { listJsxx, getJsxx, delJsxx, addJsxx, updateJsxx } from "@/api/zhaoshang/jsxx"
-export default {
-  props: {
-    info: {
-      type: Object,
-      default: null
-    }
-  },
-  data() {
-    return {
-      value:'',
-      value1:'',
-      options: [{
-                value: '选项1',
-                label: '黄金糕'
-              }, {
-                value: '选项2',
-                label: '双皮奶'
-              }],
-	tableDataa:[],
-      tableData: [
-      {
-                fjlx: '设备清单',
-                index:1,
-                time: '2025-06-16 16:57',
-      },
-      {
-                fjlx: '设备发票',
-                index:2,
-                time: '2025-06-16 16:57',
-      },
-      {
-                fjlx: '设备合同',
-                index:3,
-                time: '2025-06-16 16:57',
-      },
-      {
-                fjlx: '入统资料',
-                index:4,
-                time: '2025-06-16 16:57',
-      }
-      ],
-      form: {
-                name: '',
-                region: '',
-                date1: '',
-                date2: '',
-                delivery: false,
-                type: [],
-                resource: '',
-                desc: ''
-              },
-              formLabelWidth: '120px',
-              dialogFormVisible:false,
-              input:'',
-      rules: {
-        // jzqk: [
-        //   { required: true, message: "请输入", trigger: "blur" }
-        // ],
-
-
-      },
-	  jyzhp:{
-	  		  fileName:'项目每月建设照片',
-	  },
-	  xsht:{
-	  			  fileName:'设备清单',
-	  		  bigType:'c',
-	  		  type:15
-	  },
-	  xsfp:{
-	  		  bigType:'c',
-	  			  fileName:'设备发票',
-	  		  type:16
-	  },
-	  cwbb:{
-	  		  bigType:'c',
-	  			  fileName:'设备合同',
-	  		  type:17
-	  },
-	  tjbb:{
-	  			  fileName:'入统资料',
-	  		  bigType:'c',
-	  		  type:18
-	  },
-	  issfe:true,
-	  jylist:[],
-	  xshtlist:[],
-	  xsfqlist:[],
-	  cwbblist:[],
-	  tjbblist:[],
-	  timete:null
-    }
-  },
-  watch: {
-	  secondChange(){
-	         this.gethusie()
-	        }
-
-  },
-  computed:{
-        secondChange(){
-          return this.info.xmbh
-        }
-      },
-  created() {
-	   this.gethusie()
-  },
-  methods:{
-	  // 回显
-	  gethusie(){
-		console.log(this.info)
-		this.jylist = []
-		this.xshtlist = []
-		this.xsfqlist = []
-		this.cwbblist = []
-		this.tjbblist = []
-		let that = this
-		that.issfe = false
-		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
-
-		 if(that.info.id == -1){
-		 		  // 新增
-				  console.log(2)
-		 		// this.getList()
-		 }else{
-			 console.log(3)
-		 		  // 修改
-		 		  that.getList()
-				  if(that.info.beginTime != null){
-				  	if(that.info.endTime != null){
-				  		let sgse = that.info.beginTime + ',' +  that.info.endTime
-				  		that.timete = sgse.split(',')
-				  	}
-				  }else{
-				  	that.timete = null
-				  }
-		 				  if(that.info.zsyzFjList.length !=0){
-		 				  	that.info.zsyzFjList.filter(rou=>{
-		 				  		if(rou.bigType == 'c' ){
-		 				  			if(rou.type == 15){
-		 				  				// 设备清单
-										console.log(this.info)
-		 				  				that.xshtlist.push(rou)
-		 				  			}
-		 				  			if(rou.type == 16){
-		 				  				// 设备清单
-										console.log(that.info)
-		 				  				that.xsfqlist.push(rou)
-		 				  			}
-		 				  			if(rou.type == 17){
-		 				  				// 设备清单
-		 				  				that.cwbblist.push(rou)
-		 				  			}
-		 				  			if(rou.type == 18){
-		 				  				// 设备清单
-		 				  				that.tjbblist.push(rou)
-		 				  			}
-		 				  		}
-		 				  	})
-		 				  }
-
-		 }
-
-		   }, 1000);
-		that.issfe = true
-	  },
-	  nsewe(val){
-		console.log(val)
-		this.info.beginTime = val[0]
-		this.info.endTime = val[1]
-	  },
-	  getList() {
-	  	let sgnsegse={xmbh:this.info.xmbh}
-	    listJdqk(sgnsegse).then(response => {
-	      this.tableDataa = response.rows
-	     this.tableDataa.filter(rou=>{
-			 if(rou.tdcrzje == null || rou.tdcrzje ==''){
-				 rou.tdcrzjes = 0
-			 }else{
-				 rou.tdcrzjes = rou.tdcrzje
-			 }
-			 if(rou.cftrje == null || rou.cftrje ==''){
-			 	rou.cftrjes = 0
-			 }else{
-				 rou.cftrjes = rou.cftrje
-			 }
-			 if(rou.sbqd == null || rou.sbqd ==''){
-			 	rou.sbqds = 0
-			 }else{
-				 rou.sbqds = rou.sbqd
-			 }
-			 if(rou.fpje == null || rou.fpje ==''){
-			 	rou.fpjes = 0
-			 }else{
-				 rou.fpjes = rou.fpje
-			 }
-			 if(rou.htje == null || rou.htje ==''){
-			 	rou.htjes = 0
-			 }else{
-				 rou.htjes = rou.htje
-			 }
-			 rou.shiji = (rou.tdcrzjes - 0) +  (rou.cftrjes - 0) +(rou.sbqds - 0)+(rou.fpjes - 0)+(rou.htjes - 0)
-		 })
-	    })
-	  },
-
-	  // 每月更新提交
-	  handleAdd(){
-	  	 if(this.form.jzqk == null){
-	  		this.$message.error('请填写信息');
-	  		return
-	  	 }
-	  	 this.form.xmbh = this.info.xmbh
-		 this.form.jsxxId = this.info.jsxxId
-		 if(this.form.jdqkId != null && this.form.jdqkId != undefined){
-			 updateJdqk(this.form).then(response => {
-			   this.$modal.msgSuccess("修改成功")
-			   this.open = false
-			   this.getList()
-			 })
-		 }else{
-
-			addJdqk(this.form).then(response => {
-			  this.$modal.msgSuccess("新增成功")
-			  this.open = false
-			  this.getList()
-			})
-		 }
-
-	  },
-	  // 表单重置
-	  reset() {
-	    this.form = {
-	                    jdqkMonth: null,
-	                    jzqk: null,
-	                    czwt: null,
-	                    jjjy: null,
-	                    gzjh: null,
-	                    tdcrzje: null,
-	                    cftrje: null,
-	                    sbqd: null,
-	                    fpje: null,
-	                    htje: null,
-	                    upTime: null,
-	                    jsPhoto: null,
-	                    createBy: null,
-	                    createTime: null,
-	                    updateBy: null,
-	                    updateTime: null,
-	                    remark: null
-	          }
-	    this.resetForm("form")
-	  },
-	  /** 修改按钮操作 */
-	  handleUpdate(row) {
-	    this.reset()
-	    const tzfkId = row.jdqkId
-	    getJdqk(tzfkId).then(response => {
-	      this.form = response.data
-	      this.open = true
-	      this.title = "修改信息"
-	    })
-	  },
-	  /** 删除按钮操作 */
-	  handleDelete(row) {
-	    const tzfkIds = row.jdqkId
-	    delJdqk(tzfkIds).then(response => {
-	      this.$modal.msgSuccess("删除成功")
-	      this.getList()
-	    })
-	  },
-	  /** 提交按钮 */
-	  submitForm: function() {
-	    this.$refs["basicInfoForm"].validate(valid => {
-	      if (valid) {
-	  		 this.info.zsyzFjList = []
-	  		 if(this.jylist.length !=0){
-	  			 this.info.zsyzFjList = this.info.zsyzFjList.concat(this.jylist )
-	  		 }
-	  		 if(this.xshtlist.length !=0){
-	  			 this.info.zsyzFjList = this.info.zsyzFjList.concat(this.xshtlist )
-	  		 }
-	  		 if(this.xsfqlist.length !=0){
-	  		 	 this.info.zsyzFjList = this.info.zsyzFjList.concat(this.xsfqlist )
-	  		 }
-	  		 if(this.cwbblist.length !=0){
-	  		 	 this.info.zsyzFjList = this.info.zsyzFjList.concat(this.cwbblist )
-	  		 }
-	  		 if(this.tjbblist.length !=0){
-	  		 	 this.info.zsyzFjList = this.info.zsyzFjList.concat(this.tjbblist )
-	  		 }
-	  		 console.log(this.info.zsyzFjList,this.info,6)
-	  		 // return
-	        if (this.info.id != -1) {
-	          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.info.jsxxId = response.data;
-          this.$emit("getSubmit",response.data)
-	            // this.open = false
-	  		   // this.$router.go(-1)
-	            // this.getList()
-	          })
-	        }
-	      }
-	    })
-	  },
-  }
-}
+	import {
+		listJdqk,
+		getJdqk,
+		delJdqk,
+		addJdqk,
+		updateJdqk
+	} from "@/api/zhaoshang/jdqk"
+	import {
+		listJsxx,
+		getJsxx,
+		delJsxx,
+		addJsxx,
+		updateJsxx
+	} from "@/api/zhaoshang/jsxx"
+	export default {
+		props: {
+			info: {
+				type: Object,
+				default: null
+			}
+		},
+		data() {
+			return {
+				value: '',
+				value1: '',
+				options: [{
+					value: '选项1',
+					label: '黄金糕'
+				}, {
+					value: '选项2',
+					label: '双皮奶'
+				}],
+				tableDataa: [],
+				tableData: [{
+						fjlx: '设备清单',
+						index: 1,
+						time: '2025-06-16 16:57',
+					},
+					{
+						fjlx: '设备发票',
+						index: 2,
+						time: '2025-06-16 16:57',
+					},
+					{
+						fjlx: '设备合同',
+						index: 3,
+						time: '2025-06-16 16:57',
+					},
+					{
+						fjlx: '入统资料',
+						index: 4,
+						time: '2025-06-16 16:57',
+					}
+				],
+				form: {
+					name: '',
+					region: '',
+					date1: '',
+					date2: '',
+					delivery: false,
+					type: [],
+					resource: '',
+					desc: ''
+				},
+				formLabelWidth: '120px',
+				dialogFormVisible: false,
+				input: '',
+				rules: {
+					jgTime: [
+					  { required: true, message: "请输入", trigger: "blur" }
+					],
+				},
+				jyzhp: {
+					fileName: '项目每月建设照片',
+				},
+				xsht: {
+					fileName: '设备清单',
+					bigType: 'c',
+					type: 15
+				},
+				xsfp: {
+					bigType: 'c',
+					fileName: '设备发票',
+					type: 16
+				},
+				cwbb: {
+					bigType: 'c',
+					fileName: '设备合同',
+					type: 17
+				},
+				tjbb: {
+					fileName: '入统资料',
+					bigType: 'c',
+					type: 18
+				},
+				issfe: true,
+				jylist: [],
+				xshtlist: [],
+				xsfqlist: [],
+				cwbblist: [],
+				tjbblist: [],
+				timete: null
+			}
+		},
+		watch: {
+			secondChange() {
+				this.gethusie()
+			}
+		},
+		computed: {
+			secondChange() {
+				return this.info.xmbh
+			}
+		},
+		created() {
+			this.gethusie()
+		},
+		methods: {
+			cldke(){
+				this.$router.go(-1)
+			},
+			// 回显
+			gethusie() {
+				let that = this
+				that.issfe = false
+				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.jylist = []
+					that.xshtlist = []
+					that.xsfqlist = []
+					that.cwbblist = []
+					that.tjbblist = []
+					if (that.info.id == -1) {
+						// 新增
+						// this.getList()
+					} else {
+						// 修改
+						that.getList()
+						
+						if (that.info.beginTime != null) {
+							if (that.info.endTime != null) {
+								let sgse = that.info.beginTime + ',' + that.info.endTime
+								that.timete = sgse.split(',')
+							}
+						} else {
+							that.timete = null
+						}
+						if (that.info.zsyzFjList.length != 0) {
+							console.log(that.cwbblist)
+							that.info.zsyzFjList.filter(rou => {
+								if (rou.bigType == 'c') {
+									if (rou.type == 15) {
+										// 设备清单
+										that.xshtlist.push(rou)
+									}
+									if (rou.type == 16) {
+										// 设备清单
+										that.xsfqlist.push(rou)
+									}
+									if (rou.type == 17) {
+										// 设备清单
+										that.cwbblist.push(rou)
+										console.log(that.cwbblist)
+									}
+									if (rou.type == 18) {
+										// 设备清单
+										that.tjbblist.push(rou)
+									}
+								}
+							})
+						}
+
+					}
+
+				}, 1000);
+				that.issfe = true
+			},
+			nsewe(val) {
+				console.log(val)
+				this.info.beginTime = val[0]
+				this.info.endTime = val[1]
+			},
+			getList() {
+				let sgnsegse = {
+					xmbh: this.info.xmbh
+				}
+				listJdqk(sgnsegse).then(response => {
+					this.tableDataa = response.rows
+					this.tableDataa.filter(rou => {
+						if (rou.tdcrzje == null || rou.tdcrzje == '') {
+							rou.tdcrzjes = 0
+						} else {
+							rou.tdcrzjes = rou.tdcrzje
+						}
+						if (rou.cftrje == null || rou.cftrje == '') {
+							rou.cftrjes = 0
+						} else {
+							rou.cftrjes = rou.cftrje
+						}
+						if (rou.sbqd == null || rou.sbqd == '') {
+							rou.sbqds = 0
+						} else {
+							rou.sbqds = rou.sbqd
+						}
+						if (rou.fpje == null || rou.fpje == '') {
+							rou.fpjes = 0
+						} else {
+							rou.fpjes = rou.fpje
+						}
+						if (rou.htje == null || rou.htje == '') {
+							rou.htjes = 0
+						} else {
+							rou.htjes = rou.htje
+						}
+						rou.shiji = (rou.tdcrzjes - 0) + (rou.cftrjes - 0) + (rou.sbqds - 0) + (rou.fpjes -
+							0) + (rou.htjes - 0)
+					})
+				})
+			},
+
+			// 每月更新提交
+			handleAdd() {
+				if (this.form.jzqk == null) {
+					this.$message.error('请填写信息');
+					return
+				}
+				this.form.xmbh = this.info.xmbh
+				this.form.jsxxId = this.info.jsxxId
+				if(this.form.jsxxId == null || this.form.jsxxId == undefined){
+					this.$message.error('请先填写建设信息');
+					return
+				}
+				if (this.form.jdqkId != null && this.form.jdqkId != undefined) {
+					updateJdqk(this.form).then(response => {
+						this.$modal.msgSuccess("修改成功")
+						this.open = false
+						this.getList()
+					})
+				} else {
+
+					addJdqk(this.form).then(response => {
+						this.$modal.msgSuccess("新增成功")
+						this.open = false
+						this.getList()
+					})
+				}
+
+			},
+			// 表单重置
+			reset() {
+				this.form = {
+					jdqkMonth: null,
+					jzqk: null,
+					czwt: null,
+					jjjy: null,
+					gzjh: null,
+					tdcrzje: null,
+					cftrje: null,
+					sbqd: null,
+					fpje: null,
+					htje: null,
+					upTime: null,
+					jsPhoto: null,
+					createBy: null,
+					createTime: null,
+					updateBy: null,
+					updateTime: null,
+					remark: null
+				}
+				this.resetForm("form")
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset()
+				const tzfkId = row.jdqkId
+				getJdqk(tzfkId).then(response => {
+					this.form = response.data
+					this.open = true
+					this.title = "修改信息"
+				})
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const tzfkIds = row.jdqkId
+				delJdqk(tzfkIds).then(response => {
+					this.$modal.msgSuccess("删除成功")
+					this.getList()
+				})
+			},
+			/** 提交按钮 */
+			submitForm: function() {
+				this.$refs["basicInfoForm"].validate(valid => {
+					if (valid) {
+						this.info.zsyzFjList = []
+						if (this.jylist.length != 0) {
+							this.info.zsyzFjList = this.info.zsyzFjList.concat(this.jylist)
+						}
+						if (this.xshtlist.length != 0) {
+							this.info.zsyzFjList = this.info.zsyzFjList.concat(this.xshtlist)
+						}
+						if (this.xsfqlist.length != 0) {
+							this.info.zsyzFjList = this.info.zsyzFjList.concat(this.xsfqlist)
+						}
+						if (this.cwbblist.length != 0) {
+							this.info.zsyzFjList = this.info.zsyzFjList.concat(this.cwbblist)
+						}
+						if (this.tjbblist.length != 0) {
+							this.info.zsyzFjList = this.info.zsyzFjList.concat(this.tjbblist)
+						}
+						if (this.info.id != -1) {
+							updateJsxx(this.info).then(response => {
+								this.$modal.msgSuccess("修改成功")
+								let sngsej={name:'third'}
+								this.$emit('handeqi',sngsej)
+							})
+						} else {
+							addJsxx(this.info).then(response => {
+								this.$modal.msgSuccess("新增成功")
+								this.form.jsxxId = response.data
+								this.info.jsxxId = response.data;
+								this.info.id = response.data
+								this.$emit("getSubmit", response.data)
+								let sngsej={name:'third'}
+								this.$emit('handeqi',sngsej)
+							})
+						}
+					}
+				})
+			},
+		}
+	}
 </script>
 <style lang="scss" scoped>
-::v-deep {
-  .fomebox{
-    .el-button--primary{font-size: 14px;padding: 8px 14px;}
-    .el-form-item__label{padding-bottom: 0;line-height: 38px;}
-    .el-form-item{margin-bottom: 15px;}
-    .el-input__inner{height: 40px;line-height: 40px;}
-    .el-date-editor.el-input{width: 100%;}
-    .el-select{width: 100%;}
-    table{width: 100% !important;}
-    .upbox{padding:8px 12px;
-      img{width: 12px;height: 12px;margin-right: 2px;}
-      // color: #00A854;
-    }
-    .el-table .el-table__header-wrapper th{background: #F6FAFD;}
-   }
-   .infobox{
-     .el-dialog__header{border-bottom: 1px solid #E6E6E6;padding: 0;}
-   }
-   .el-dialog__header{border-bottom: 1px solid #E6E6E6;padding: 0;}
-}
-.fomebox{background: #FFFFFF;margin-bottom: 15px;border-radius: 4px;
-
-  .rowbox{padding: 10px 15px 9px;}
-  .ftab{font-weight: bold;font-size: 14px;color: #2777D0;padding: 7px 16px 0px;
-    .line{width: 6px;margin-right: 9px;height: 20px;background: #2777D0;}
-  }
-  .txt{font-weight: 500;padding-right: 34px;
-font-size: 14px;
-color: #666666;}
-  .btna{font-weight: 500;font-size: 14px;padding: 0 13px;
-    .imgs{width: 15px;height: 15px;display: flex;align-items: center;justify-content: center;margin-right: 7px;
-      .imga{width: 13px;height: 14px;}
-      .imgb{width: 14px;height: 14px;}
-      .imgc{width: 15px;height: 15px;}
-      .imgd{width: 13px;height: 14px;}
-    }
-    &.coa{color: #1890FF;}
-    &.cob{color: #FE7F0E;}
-    &.coc{color: #00A854;}
-    &.cod{color: #F25858;}
-  }
-}
-.ftop{padding: 10px 17px 10px 16px;border-bottom: 1px solid #E6E6E6;
-    .timg{width: 20px;height: 20px;margin-right: 13px;}
-    .tit{font-weight: bold;font-size: 16px;color: #222838;}
-    &.diaboxt{padding: 16px;border-bottom: none;}
-}
-
-</style>
+	::v-deep {
+		.fomebox {
+			.el-button--primary {
+				font-size: 14px;
+				padding: 8px 14px;
+			}
+
+			.el-form-item__label {
+				padding-bottom: 0;
+				line-height: 38px;
+			}
+
+			.el-form-item {
+				margin-bottom: 15px;
+			}
+
+			.el-input__inner {
+				height: 40px;
+				line-height: 40px;
+			}
+
+			.el-date-editor.el-input {
+				width: 100%;
+			}
+
+			.el-select {
+				width: 100%;
+			}
+
+			table {
+				width: 100% !important;
+			}
+
+			.upbox {
+				padding: 8px 12px;
+
+				img {
+					width: 12px;
+					height: 12px;
+					margin-right: 2px;
+				}
+
+				// color: #00A854;
+			}
+
+			.el-table .el-table__header-wrapper th {
+				background: #F6FAFD;
+			}
+		}
+
+		.infobox {
+			.el-dialog__header {
+				border-bottom: 1px solid #E6E6E6;
+				padding: 0;
+			}
+		}
+
+		.el-dialog__header {
+			border-bottom: 1px solid #E6E6E6;
+			padding: 0;
+		}
+	}
+
+	.fomebox {
+		background: #FFFFFF;
+		margin-bottom: 15px;
+		border-radius: 4px;
+
+		.rowbox {
+			padding: 10px 15px 9px;
+		}
+
+		.ftab {
+			font-weight: bold;
+			font-size: 14px;
+			color: #2777D0;
+			padding: 7px 16px 0px;
+
+			.line {
+				width: 6px;
+				margin-right: 9px;
+				height: 20px;
+				background: #2777D0;
+			}
+		}
+
+		.txt {
+			font-weight: 500;
+			padding-right: 34px;
+			font-size: 14px;
+			color: #666666;
+		}
+
+		.btna {
+			font-weight: 500;
+			font-size: 14px;
+			padding: 0 13px;
+
+			.imgs {
+				width: 15px;
+				height: 15px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-right: 7px;
+
+				.imga {
+					width: 13px;
+					height: 14px;
+				}
+
+				.imgb {
+					width: 14px;
+					height: 14px;
+				}
+
+				.imgc {
+					width: 15px;
+					height: 15px;
+				}
+
+				.imgd {
+					width: 13px;
+					height: 14px;
+				}
+			}
+
+			&.coa {
+				color: #1890FF;
+			}
+
+			&.cob {
+				color: #FE7F0E;
+			}
+
+			&.coc {
+				color: #00A854;
+			}
+
+			&.cod {
+				color: #F25858;
+			}
+		}
+	}
+
+	.ftop {
+		padding: 10px 17px 10px 16px;
+		border-bottom: 1px solid #E6E6E6;
+
+		.timg {
+			width: 20px;
+			height: 20px;
+			margin-right: 13px;
+		}
+
+		.tit {
+			font-weight: bold;
+			font-size: 16px;
+			color: #222838;
+		}
+
+		&.diaboxt {
+			padding: 16px;
+			border-bottom: none;
+		}
+	}
+</style>

src/views/zhaoshang/completed/index.vue

@@ -88,6 +88,7 @@
               <div class="flex1"></div>
 			  <div>
 				   <el-button type="success"  @click="hunge(item)"  class="cbbtn" size="small" >查看</el-button>
+				   <el-button type="danger"  @click="handleDelete(item)"  class="cbbtn" size="small" >删除</el-button>
 			  </div>
           </div>
           <div class="lbox">
@@ -326,14 +327,14 @@ export default {
         }
       })
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const noticeIds = row.qyxxId || this.ids
-	  delQyxx(noticeIds).then(response => {
+	/** 删除按钮操作 */
+	handleDelete(row) {
+	  const tzfkIds = row.qyxxId 
+	  delQyxx(tzfkIds).then(response => {
 	    this.$modal.msgSuccess("删除成功")
-	    this.getList()
+		this.$parent.getList();
 	  })
-    },
+	},
 	 handleExport() {
 	      this.download('zhaoshangV3/qyxx/export', {
 	        ...this.queryParams