wangmengwei hai 1 mes
pai
achega
0a04e95d22

+ 5 - 2
src/components/FileUploads/index.vue

@@ -21,11 +21,11 @@
       <el-button size="mini" type="primary">上传</el-button>
 	   </el-tooltip>
       <!-- 上传提示 -->
-      <div class="el-upload__tip" slot="tip" v-if="isShowTip">
+      <!-- <div class="el-upload__tip" slot="tip" v-if="isShowTip">
         <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
         <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
         的文件
-      </div>
+      </div> -->
     </el-upload>
 
     <!-- 文件列表 -->
@@ -60,6 +60,9 @@ export default {
     data: {
       type: Object
     },
+	datam:{
+		type: Object
+	},
     // 数量限制
     limit: {
       type: Number,

+ 1 - 1
src/layout/components/Navbar.vue

@@ -107,7 +107,7 @@ export default {
   methods: {
 	  windowScroll() {
 	      let scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
-	  	console.log(scrollTop)
+	  	// console.log(scrollTop)
 	  	if(scrollTop  < 13){
 	  		this.hsige = true
 	  	}else{

+ 1 - 1
src/layout/components/Sidebar/Logo.vue

@@ -47,7 +47,7 @@ export default {
   methods:{
 	windowScroll() {
 	    let scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
-		console.log(scrollTop)
+		// console.log(scrollTop)
 		if(scrollTop  < 13){
 			this.logo = logoImg
 			this.hsige = true

+ 171 - 94
src/views/project/fourthInfoForm.vue

@@ -5,49 +5,33 @@
         <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">
             <el-col :span="6">
-              <el-form-item label="投产时间" prop="remark">
+              <el-form-item label="投产时间" prop="begitcTimenTime">
                 <el-date-picker
-                      v-model="value1"
+                      v-model="info.begitcTimenTime"
                       type="date"
                       placeholder="年 / 月 / 日">
                     </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="入规时间" prop="remark">
+              <el-form-item label="入规时间" prop="rgTime">
                 <el-date-picker
-                      v-model="value1"
+                      v-model="info.rgTime"
                       type="date"
                       placeholder="年 / 月 / 日">
                     </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="本年度累计产值(万元)" prop="tableName">
-                <el-input  placeholder="请输入本年度累计产值" v-model="info.tableName" />
+              <el-form-item label="万元产值能耗" prop="wycznh">
+                <el-input  placeholder="请输入万元产值能耗" v-model="info.wycznh" />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="本会计年度实缴税收(万元)" prop="tableComment">
-                <el-input placeholder="请输入本会计年度实缴税收" v-model="info.tableComment" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="累计用电(万千瓦时)" prop="className">
-                <el-input placeholder="请输入累计用电" v-model="info.className" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="万元产值能耗(吨/万元)" prop="functionAuthor">
-                <el-input placeholder="请输入万元产值能耗" v-model="info.functionAuthor" />
-              </el-form-item>
-            </el-col>
-
           </el-row>
         </div>
       </div>
@@ -55,25 +39,26 @@
         <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 @click="handleAdd">提交</el-button>
         </div>
         <div class="rowbox">
           <el-row  :gutter="22">
             <el-col :span="6">
-              <el-form-item label="年度" prop="remark">
+              <el-form-item label="年度" prop="tcxxYear">
                 <el-date-picker
-                      v-model="value1"
+                      v-model="form.tcxxYear"
                       type="year"
+					   value-format="yyyy"
                       placeholder="选择年">
                     </el-date-picker>
-
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="月份" prop="remark">
+              <el-form-item label="月份" prop="tcxxMonth">
                 <el-date-picker
-                      v-model="value1"
+                      v-model="form.tcxxMonth"
                       type="month"
+					  value-format="MM"
                       placeholder="选择月">
                     </el-date-picker>
               </el-form-item>
@@ -81,33 +66,32 @@
           </el-row>
           <el-row :gutter="22">
             <el-col :span="6">
-              <el-form-item label="当月累计产值(万元)" prop="tableName">
-                <el-input  placeholder="请输入累计产值" v-model="info.tableName" />
+              <el-form-item label="当月累计产值(万元)" prop="cz">
+                <el-input type="number"  placeholder="请输入累计产值" v-model="form.cz" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="当月实缴税收(万元)" prop="tableComment">
-                <el-input placeholder="请输入实缴税收" v-model="info.tableComment" />
+              <el-form-item label="当月实缴税收(万元)" prop="sjss">
+                <el-input type="number" placeholder="请输入实缴税收" v-model="form.sjss" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="当月累计用电(万千瓦时)" prop="className">
-                <el-input placeholder="请输入累计用电" v-model="info.className" />
+              <el-form-item label="当月累计用电(万千瓦时)" prop="hdl">
+                <el-input type="number" placeholder="请输入累计用电" v-model="form.hdl" />
               </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 height="213"show-summary  :data="tableDataa" border style="width: 100%;margin-bottom: 15px;">
+              <el-table :max-height="213"show-summary  :data="tableDataa" border style="width: 100%;margin-bottom: 15px;">
                   <el-table-column align="center" type="index" label="序号"  width="150"></el-table-column>
-                  <el-table-column align="center" prop="fjlx" label="当月累计产值(万元)"  width="200"> </el-table-column>
-                  <el-table-column align="center" prop="name" label="当月实缴税收(万元)"  width="200"> </el-table-column>
-                  <el-table-column align="center" prop="dx" label="当月累计用电(万千瓦时)"  width="200"> </el-table-column>
-                  <el-table-column align="center" prop="time" label="上报时间" width="500">
+                  <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>
                 </el-table>
           </div>
@@ -116,41 +100,27 @@
         <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;">
-                <el-table-column align="center" prop="fjlx" label="附件类型"  width="20%"> </el-table-column>
-                <el-table-column align="center" prop="name" label="文件名称"  width="20%"> </el-table-column>
-                <el-table-column align="center" prop="dx" label="附件大小"  width="15%"> </el-table-column>
-                <el-table-column align="center" prop="time" label="上传时间"  width="15%"> </el-table-column>
-                <el-table-column align="center" label="操作" width="30%">
-                  <template slot-scope="scope">
-                   <div class="flexcc">
-                     <div class="btna flexc coa">
-                       <div class="imgs">
-                         <img class="imga" src="@/assets/images/project/upa.png"/>
-                       </div>上传
-                     </div>
-                     <div class="btna flexc cob">
-                       <div class="imgs">
-                         <img class="imgb" src="@/assets/images/project/upb.png"/>
-                       </div>预览
-                     </div>
-                     <div class="btna flexc coc">
-                       <div class="imgs">
-                         <img class="imga" src="@/assets/images/project/upc.png"/>
-                       </div>下载
-                     </div>
-                     <div class="btna flexc cod">
-                       <div class="imgs">
-                         <img class="imgc" src="@/assets/images/project/upd.png"/>
-                       </div>删除
-                     </div>
-                   </div>
-                  </template>
-                </el-table-column>
-              </el-table>
+			<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">
+			         <div class="btna flexc coa">
+					    <fileUploads  v-model="form.reportUrl" :datam="jyzhp"  v-if="index == 0"/>
+						 <fileUploads  v-model="form.reportUrl" :datam="xsht" v-if="index == 1" />
+						  <fileUploads  v-model="form.reportUrl" :datam="xsfp" v-if="index == 2" />
+						   <fileUploads  v-model="form.reportUrl" :datam="cwbb" v-if="index == 3" />
+						    <fileUploads  v-model="form.reportUrl" :datam="tjbb" v-if="index == 4" />
+			         </div>
+			       </div>
+			      </template>
+			    </el-table-column>
+			  </el-table>
+           
         </div>
       </div>
     </el-form>
@@ -163,6 +133,7 @@
 </template>
 
 <script>
+import { listMonth, getMonth, delMonth, addMonth, updateMonth } from "@/api/zhaoshang/month"
 export default {
   props: {
     info: {
@@ -174,6 +145,19 @@ export default {
     return {
       value:'',
       value1:'',
+	  loading:false,
+	  form:{
+		          tcxxYear: null,
+		          tcxxMonth: null,
+		          cz: null,
+		          sjss: null,
+		          hdl: null,
+		          createBy: null,
+		          createTime: null,
+		          updateBy: null,
+		          updateTime: null,
+		          remark: null
+	  },
       options: [{
                 value: '选项1',
                 label: '黄金糕'
@@ -182,32 +166,125 @@ export default {
                 label: '双皮奶'
               }],
       tableData: [{
-                fjlx: '项目可行性研究报告',
-                name: '项目可行性研究报告.pdf',
-                dx: '11.8 MB',
+                fjlx: '项目生产经营照片',
+                index:0,
                 time: '2025-06-16 16:57',
-      }],
+      },
+	  {
+	            fjlx: '销售合同',
+	            index:0,
+	            time: '2025-06-16 16:57',
+	  },
+	  {
+	            fjlx: '销售发票',
+	            index:0,
+	            time: '2025-06-16 16:57',
+	  },
+	  {
+	            fjlx: '公司财务报表',
+	            index:0,
+	            time: '2025-06-16 16:57',
+	  },
+	  {
+	            fjlx: '生产统计报表',
+	            index:0,
+	            time: '2025-06-16 16:57',
+	  }
+	  ],
+	  jyzhp:{
+		  xmId:null,
+		  xmbh:null,
+		  xmmc:null,
+		  bigType:'d',
+		  type:19
+	  },
+	  xsht:{
+	  		  xmId:null,
+	  		  xmbh:null,
+	  		  xmmc:null,
+	  		  bigType:'d',
+	  		  type:20
+	  },
+	  xsfp:{
+	  		  xmId:null,
+	  		  xmbh:null,
+	  		  xmmc:null,
+	  		  bigType:'d',
+	  		  type:21
+	  },
+	  cwbb:{
+	  		  xmId:null,
+	  		  xmbh:null,
+	  		  xmmc:null,
+	  		  bigType:'d',
+	  		  type:22
+	  },
+	  tjbb:{
+	  		  xmId:null,
+	  		  xmbh:null,
+	  		  xmmc:null,
+	  		  bigType:'d',
+	  		  type:23
+	  },
       tableDataa: [
-        {fjlx: '140',name: '14',dx: '100',time: '2025-06-16 16:57',},
-        {fjlx: '210',name: '21',dx: '80',time: '2025-06-16 16:57',},
-        {fjlx: '97',name: '9.7',dx: '60',time: '2025-06-16 16:57',},
-        {fjlx: '100',name: '10',dx: '90',time: '2025-06-16 16:57',},
         ],
       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" }
-        // ]
       }
     }
+  },
+  created() {
+	  if(this.$route.query.id == -1){
+		  // 新增
+		this.info = {tcxxId: null,
+        xmId: null,
+        xmbh: null,
+        xmmc: null,
+        tcTime: null,
+        rgTime: null,
+        wycznh: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null}
+		this.getList()
+	  }else{
+		  // 修改
+		  this.getList()
+		  
+	  }
+  	
+  },
+  mounted() {
+  	
+  },
+  methods:{
+	  getList() {
+	    this.loading = true
+	    listQyxx(this.queryParams).then(response => {
+	      this.tableDataa = response.rows
+	      this.total = response.total
+	      this.loading = false
+	    })
+	  },
+ // 每月更新提交
+ handleAdd(){
+	 if(this.form.tcxxYear == null){
+		this.$message.error('请填写年度'); 
+		return
+	 }
+	 if(this.form.tcxxMonth == null){
+	 		this.$message.error('请填写月份'); 
+			return
+	 }
+	 console.log(this.form)
+	 return
+	 addJsxx(this.form).then(response => {
+	   this.$modal.msgSuccess("新增成功")
+	   this.open = false
+	   this.getList()
+	 })
+ }
   }
 }
 </script>

+ 9 - 1
src/views/project/list.vue

@@ -91,7 +91,7 @@
             </div> -->
             <div style="width: 25px;"></div>
             <!-- <el-button type="success"  class="cbbtn"  size="small">一键催办</el-button> -->
-            <el-button type="primary" plain   size="small">创建</el-button>
+            <el-button type="primary" plain   size="small" @click="hadeadd">创建</el-button>
             <el-button type="success"  class="cbbtn" size="small" @click="handleExport">导出</el-button>
           </div>
 		  <div class="blist" >
@@ -259,6 +259,14 @@ export default {
       this.single = selection.length!=1
       this.multiple = !selection.length
     },
+	hadeadd(){
+		this.$router.push({
+		  path: '/zhaoshang/add',
+		  query: {
+		  	'id':-1,
+		  }
+		})
+	},
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()