zouling hai 4 semanas
pai
achega
4a10b3d77f

+ 2 - 2
src/views/project/add.vue

@@ -42,7 +42,7 @@
                   <span>建设环节
                   </span>
                 </div>
-                <third-info-form v-if="activeName=='third'" ref="thirdInfo" :info="jshjinfo"></third-info-form>
+                <third-info-form v-if="activeName=='third'" ref="thirdInfo" :info="jshjinfo" @getSubmit="getJsxxDetail"></third-info-form>
                 </el-tab-pane>
               <el-tab-pane  name="fourth" :disabled="isdisabled">
                 <div slot="label" class="tab flexc" @click="handleClicka">
@@ -51,7 +51,7 @@
                   <span>投产环节
                   </span>
                 </div>
-                <fourth-info-form v-if="activeName=='fourth' " ref="fourthInfo" :info="tchjinfo"></fourth-info-form>
+                <fourth-info-form v-if="activeName=='fourth' " ref="fourthInfo" :info="tchjinfo" @getSubmit="getTcxxDetail"></fourth-info-form>
                 </el-tab-pane>
             </el-tabs>
 

+ 1 - 1
src/views/project/firstInfoForm.vue

@@ -276,7 +276,7 @@
     </el-form>
     <div class="flexcc pt7">
         <!-- <el-button type="primary" plain>暂存</el-button> -->
-         <el-button type="primary" @click="getSubmit" style="margin-left: 26px;">提交</el-button>
+         <el-button type="primary" v-hasPermi="['zhaoshangV3:qyxx:add']" @click="getSubmit" style="margin-left: 26px;">提交</el-button>
     </div>
   </div>
 

+ 5 - 4
src/views/project/fourthInfoForm.vue

@@ -25,7 +25,7 @@
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="万元产值能耗(吨/万元)" prop="wycznh">
-								<el-input placeholder="请输入万元产值能耗" v-model="info.wycznh" />
+								<el-input placeholder="请输入万元产值能耗" v-model="info.wycznh"  clearable/>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -57,17 +57,17 @@
 					<el-row :gutter="22">
 						<el-col :span="6">
 							<el-form-item label="当月累计产值(万元)" prop="cz">
-								<el-input type="number" placeholder="请输入累计产值" v-model="form.cz" />
+								<el-input type="number" placeholder="请输入累计产值" v-model="form.cz"  clearable/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="当月实缴税收(万元)" prop="sjss">
-								<el-input type="number" placeholder="请输入实缴税收" v-model="form.sjss" />
+								<el-input type="number" placeholder="请输入实缴税收" v-model="form.sjss"  clearable/>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="当月累计用电(万千瓦时)" prop="hdl">
-								<el-input type="number" placeholder="请输入累计用电" v-model="form.hdl" />
+								<el-input type="number" placeholder="请输入累计用电" v-model="form.hdl"  clearable/>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -442,6 +442,7 @@
 								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()

+ 5 - 4
src/views/project/secondInfoForm.vue

@@ -5,7 +5,7 @@
         <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>
+          <!-- <el-button type="primary" plain>保存</el-button> -->
         </div>
         <div class="rowbox">
           <el-row  :gutter="22">
@@ -46,7 +46,7 @@
         <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>
+          <!-- <el-button type="primary" plain>保存</el-button> -->
         </div>
         <div class="rowbox">
           <el-row  :gutter="22">
@@ -77,7 +77,7 @@
         <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>
+          <!-- <el-button type="primary" plain>保存</el-button> -->
         </div>
         <div class="rowbox">
             <el-table  :data="tableData" border style="width: 100%;margin-bottom: 15px;">
@@ -107,7 +107,7 @@
     </el-form>
     <div class="flexcc pt7">
         <!-- <el-button type="primary" plain>暂存</el-button> -->
-         <el-button type="primary" @click="getSubmit"  style="margin-left: 26px;">提交</el-button>
+         <el-button type="primary" v-hasPermi="['zhaoshangV3:kgxx:add']" @click="getSubmit"  style="margin-left: 26px;">提交</el-button>
     </div>
   </div>
 
@@ -200,6 +200,7 @@ export default {
             }else{
               addKgxx(params).then(res=>{
                 if(res.code==200){
+                  this.$emit("getSubmit",res.data)
                   this.$message.success('保存成功');
                 }
               })

+ 33 - 32
src/views/project/thirdInfoForm.vue

@@ -66,43 +66,43 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="建设进展情况" prop="jzqk">
-                <el-input type="textarea" placeholder="输入项目进展情况…" v-model="form.jzqk"></el-input>
+                <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"></el-input>
+                <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" />
+                <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" />
+                <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" />
+                <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" />
+                <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" />
+                <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" />
+			    <el-input placeholder="实际到位资金(万元)" v-model="form.czwt" clearable/>
 			  </el-form-item>
 			</el-col> -->
           </el-row>
@@ -169,8 +169,8 @@
         <!-- <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>
 
 </template>
@@ -236,8 +236,8 @@ export default {
         // jzqk: [
         //   { required: true, message: "请输入", trigger: "blur" }
         // ],
-        
-        
+
+
       },
 	  jyzhp:{
 	  		  fileName:'项目每月建设照片',
@@ -275,7 +275,7 @@ export default {
 	  secondChange(){
 	         this.gethusie()
 	        }
-    
+
   },
   computed:{
         secondChange(){
@@ -303,7 +303,7 @@ export default {
 		 that.xsfp.xmbh = sngsenhgt
 		 that.cwbb.xmbh = sngsenhgt
 		 that.tjbb.xmbh = sngsenhgt
-		 
+
 		 if(that.info.id == -1){
 		 		  // 新增
 				  console.log(2)
@@ -344,14 +344,14 @@ export default {
 		 				  		}
 		 				  	})
 		 				  }
-			
+
 		 }
-		 
-		   }, 1000);  
+
+		   }, 1000);
 		that.issfe = true
 	  },
 	  nsewe(val){
-		console.log(val)  
+		console.log(val)
 		this.info.beginTime = val[0]
 		this.info.endTime = val[1]
 	  },
@@ -389,11 +389,11 @@ export default {
 		 })
 	    })
 	  },
-	  
+
 	  // 每月更新提交
 	  handleAdd(){
 	  	 if(this.form.jzqk == null){
-	  		this.$message.error('请填写信息'); 
+	  		this.$message.error('请填写信息');
 	  		return
 	  	 }
 	  	 this.form.xmbh = this.info.xmbh
@@ -403,16 +403,16 @@ export default {
 			   this.$modal.msgSuccess("修改成功")
 			   this.open = false
 			   this.getList()
-			 }) 
+			 })
 		 }else{
-			 
+
 			addJdqk(this.form).then(response => {
 			  this.$modal.msgSuccess("新增成功")
 			  this.open = false
 			  this.getList()
-			}) 
+			})
 		 }
-	  	 
+
 	  },
 	  // 表单重置
 	  reset() {
@@ -440,7 +440,7 @@ export default {
 	  /** 修改按钮操作 */
 	  handleUpdate(row) {
 	    this.reset()
-	    const tzfkId = row.jdqkId 
+	    const tzfkId = row.jdqkId
 	    getJdqk(tzfkId).then(response => {
 	      this.form = response.data
 	      this.open = true
@@ -449,7 +449,7 @@ export default {
 	  },
 	  /** 删除按钮操作 */
 	  handleDelete(row) {
-	    const tzfkIds = row.jdqkId  
+	    const tzfkIds = row.jdqkId
 	    delJdqk(tzfkIds).then(response => {
 	      this.$modal.msgSuccess("删除成功")
 	      this.getList()
@@ -461,19 +461,19 @@ export default {
 	      if (valid) {
 	  		 this.info.zsyzFjList = []
 	  		 if(this.jylist.length !=0){
-	  			 this.info.zsyzFjList = this.info.zsyzFjList.concat(this.jylist )  
+	  			 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 )		 
+	  		 	 this.info.zsyzFjList = this.info.zsyzFjList.concat(this.xsfqlist )
 	  		 }
 	  		 if(this.cwbblist.length !=0){
-	  		 	 this.info.zsyzFjList = this.info.zsyzFjList.concat(this.cwbblist )		 
+	  		 	 this.info.zsyzFjList = this.info.zsyzFjList.concat(this.cwbblist )
 	  		 }
 	  		 if(this.tjbblist.length !=0){
-	  		 	 this.info.zsyzFjList = this.info.zsyzFjList.concat(this.tjbblist )		 
+	  		 	 this.info.zsyzFjList = this.info.zsyzFjList.concat(this.tjbblist )
 	  		 }
 	  		 console.log(this.info.zsyzFjList,this.info,6)
 	  		 // return
@@ -487,7 +487,8 @@ export default {
 	          addJsxx(this.info).then(response => {
 	            this.$modal.msgSuccess("新增成功")
 	  		   this.form.jsxxId =  response.data
-			   this.info.jsxxId = response.data
+			   this.info.jsxxId = response.data;
+          this.$emit("getSubmit",response.data)
 	            // this.open = false
 	  		   // this.$router.go(-1)
 	            // this.getList()