zouling 1 tháng trước cách đây
mục cha
commit
127ccf7d16

+ 2 - 2
src/components/dragFileUpload/index.vue

@@ -14,7 +14,7 @@
     </el-upload>
 
     <!-- 文件列表 -->
-    <!-- <transition-group ref="uploadFileList" class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
+    <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">
@@ -27,7 +27,7 @@
           <el-link :underline="false" @click="handleDelete(index)" type="danger" v-if="!disabled">删除</el-link>
         </div>
       </li>
-    </transition-group> -->
+    </transition-group>
   </div>
 </template>
 

+ 69 - 11
src/views/project/add.vue

@@ -24,7 +24,7 @@
                   <span>签约环节
                   </span>
                 </div>
-                <first-info-form ref="firstInfo" :info="info"></first-info-form>
+                <first-info-form ref="firstInfo" :info="qyxxinfo" @getSubmit="getSubmitqxyy"></first-info-form>
               </el-tab-pane>
               <el-tab-pane  name="second">
                 <div slot="label" class="tab flexc">
@@ -33,7 +33,7 @@
                   <span>开工环节
                   </span>
                 </div>
-                <second-info-form ref="secondInfo" :info="info"></second-info-form>
+                <second-info-form ref="secondInfo" :info="qyxxinfo"></second-info-form>
               </el-tab-pane>
               <el-tab-pane  name="third">
                 <div slot="label" class="tab flexc">
@@ -42,7 +42,7 @@
                   <span>建设环节
                   </span>
                 </div>
-                <third-info-form ref="thirdInfo" :info="info"></third-info-form>
+                <third-info-form ref="thirdInfo" :info="qyxxinfo"></third-info-form>
                 </el-tab-pane>
               <el-tab-pane  name="fourth">
                 <div slot="label" class="tab flexc">
@@ -51,7 +51,7 @@
                   <span>投产环节
                   </span>
                 </div>
-                <fourth-info-form ref="fourthInfo" :info="info"></fourth-info-form>
+                <fourth-info-form ref="fourthInfo" :info="qyxxinfo"></fourth-info-form>
                 </el-tab-pane>
             </el-tabs>
 
@@ -62,10 +62,7 @@
 
 
       </div>
-      <div class="flexcc pt7">
-          <el-button type="primary" plain>暂存</el-button>
-           <el-button type="primary" style="margin-left: 26px;">提交</el-button>
-      </div>
+
     </div>
   </div>
 </template>
@@ -75,6 +72,7 @@
   import secondInfoForm from "./secondInfoForm"
   import thirdInfoForm from "./thirdInfoForm"
   import fourthInfoForm from "./fourthInfoForm"
+  import { addQyxx, updateQyxx, delQyxx, getQyxx } from "@/api/zhaoshang/qyxx"
   export default{
     components:{
       firstInfoForm,secondInfoForm,thirdInfoForm,fourthInfoForm
@@ -90,15 +88,75 @@
           {tit:'投产',desc:[{tit:'投产信息'},{tit:'附件上传'}]},
           {tit:'完成',desc:[{tit:'提交'},{tit:'审核'}]},
         ],
-        activeName:'third',
+        activeName:'first',
         // 表详细信息
-        info: {}
+        qyxxinfo: {
+          // "qyxxId":"",//签约信息ID
+          "xmId":null,//项目编号
+          "xmbh":null,//项目编号
+          "xmmc":null,//项目名称
+           "tzfkId":null,//投资方资方库id
+          "tzf":null,//投资方
+           "sdzf":null,//属地政府
+           "qyrq":null,//签约日期
+           "xmlrr":null,//项目录入人
+           "job":null,//录入人职务
+           "lrrPhone":null,//录入人联系方式
+            "baztze":null,//备案总投资额
+           "lxsjTime":null,//立项时间
+           "cylb":null,//产业类别
+            "jsnr":null,//建设内容
+           "tzqybj":null,//投资企业背景
+            "zcqymc":null,//在潜注册公司名称
+           "zcrq":null,//企业注册日期
+           "zczj":null,//注册资金
+            "jyfw":null,//经营范围
+            "fddbr":null,//法定代表人
+           "lxfs":null,//联系方式
+           "sjtzze":null,//实际投资总额
+             "sjgdzctze":null,//实际固定资产投资额
+            "gdmj":null,//供地面积
+           "zlcf":null,//租赁厂房
+           "lztd":null,//流转土地
+            "mjtzqd":null,//亩均投资强度
+           "mjsr":null,//亩均收入
+           "yjncz":null,//预计年产值
+           "yjls":null,//预计利税
+           "tzhszq":null,//投资回收周期
+           "isDel":null,//是否删除 N:否 Y:是
+        }
       }
     },
+    created() {
+      this.getDicts("sys_yes_no").then(response => {
+        console.log(response)
+        this.jobGroupOptions = response.data;
+      });
+      // 获取当前时间
+     this.info.qyrq=this.time()
+    },
     methods:{
       handleClick(){
 
-      }
+      },
+      time() {
+				var date = new Date();
+				var y = date.getFullYear();
+				var m = date.getMonth() + 1;
+				var d = date.getDate();
+				var h = date.getHours();
+				var min = date.getMinutes();
+				var s = date.getSeconds();
+				var yearStr = y + '-' + (m < 10 ? ('0' + m) : m) + '-' + (d < 10 ? ('0' + d) : d)
+				var timeStr = (h < 10 ? ('0' + h) : h) + ':' + (min < 10 ? ('0' + min) : min) + ':' + (s < 10 ? (
+					'0' + s) : s);
+        return yearStr
+			},
+      getSubmitqxyy(params){
+          console.log(params)
+          // var info=JSON.parse(JSON.stringify(params))
+
+      },
     }
   }
 </script>

+ 72 - 57
src/views/project/firstInfoForm.vue

@@ -10,29 +10,29 @@
         <div class="rowbox">
           <el-row  :gutter="22">
             <el-col :span="6">
-              <el-form-item label="项目编号" prop="tableName">
-                <el-input disabled placeholder="内容提交后自动生成" v-model="info.tableName" />
+              <el-form-item label="项目编号" prop="xmbh">
+                <el-input disabled placeholder="内容提交后自动生成" v-model="info.xmbh" />
               </el-form-item>
             </el-col>
             <el-col :span="18">
-              <el-form-item label="项目名称" prop="tableComment">
-                <el-input placeholder="输入项目名称" v-model="info.tableComment" />
+              <el-form-item label="项目名称" prop="xmmc">
+                <el-input placeholder="输入项目名称" v-model="info.xmmc" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="投资方" prop="className">
-                <el-input placeholder="输入投资方名称" v-model="info.className" />
+                <el-input placeholder="输入投资方名称" v-model="info.tzf" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="属地政府" prop="functionAuthor">
-                <el-input placeholder="输入属地政府名称" v-model="info.functionAuthor" />
+                <el-input placeholder="输入属地政府名称" v-model="info.sdzf" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="签约日期" prop="remark">
+              <el-form-item label="签约日期" prop="qyrq">
                 <el-date-picker
-                      v-model="value1"
+                      v-model="info.qyrq"
                       type="date"
                       placeholder="年 / 月 / 日">
                     </el-date-picker>
@@ -41,18 +41,18 @@
           </el-row>
           <el-row :gutter="22">
             <el-col :span="6">
-              <el-form-item label="项目录入人" prop="className">
-                <el-input placeholder="输入项目录入人" v-model="info.className" />
+              <el-form-item label="项目录入人" prop="xmlrr">
+                <el-input placeholder="输入项目录入人" v-model="info.xmlrr" />
               </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 label="职务" prop="job">
+                <el-input placeholder="输入职务" v-model="info.job" />
               </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 label="联系方式" prop="lrrPhone">
+                <el-input placeholder="输入联系方式" v-model="info.lrrPhone" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -70,22 +70,22 @@
         <div class="rowbox">
           <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="baztze">
+                <el-input placeholder="输入总投资额" v-model="info.baztze" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="立项时间" prop="remark">
+              <el-form-item label="立项时间" prop="lxsjTime">
                 <el-date-picker
-                      v-model="value1"
+                      v-model="info.lxsjTime"
                       type="date"
                       placeholder="年 / 月 / 日">
                     </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="产业类型" prop="tableComment">
-                <el-select v-model="value" placeholder="选择产业类型">
+              <el-form-item label="产业类型" prop="cylb">
+                <el-select v-model="info.cylb" placeholder="选择产业类型">
                     <el-option
                       v-for="item in options"
                       :key="item.value"
@@ -96,8 +96,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="建设内容" prop="tableComment">
-                <el-select v-model="value" placeholder="选择建设内容">
+              <el-form-item label="建设内容" prop="jsnr">
+                <el-select v-model="info.jsnr" placeholder="选择建设内容">
                     <el-option
                       v-for="item in options"
                       :key="item.value"
@@ -110,8 +110,8 @@
           </el-row>
           <el-row :gutter="22">
             <el-col :span="24">
-              <el-form-item label="投资企业背景" prop="tableComment">
-                <el-input type="textarea" placeholder="输入投资企业背景…" v-model="info.tableComment"></el-input>
+              <el-form-item label="投资企业背景" prop="tzqybj">
+                <el-input type="textarea" placeholder="输入投资企业背景…" v-model="info.tzqybj"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -122,39 +122,39 @@
         <div class="rowbox">
           <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="zcqymc">
+                <el-input placeholder="输入公司名称" v-model="info.zcqymc" />
               </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="zczj">
+                <el-input placeholder="输入注册资金" v-model="info.zczj" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="企业注册时间" prop="remark">
+              <el-form-item label="企业注册时间" prop="zcrq">
                 <el-date-picker
-                      v-model="value1"
+                      v-model="info.zcrq"
                       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="jyfw">
+                <el-input placeholder="输入经营范围" v-model="info.jyfw" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="22">
             <el-col :span="6">
-              <el-form-item label="法定代表人" prop="tableComment">
-                <el-input placeholder="输入法定代表人" v-model="info.tableComment" />
+              <el-form-item label="法定代表人" prop="fddbr">
+                <el-input placeholder="输入法定代表人" v-model="info.fddbr" />
               </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="lxfs">
+                <el-input placeholder="输入联系方式" v-model="info.lxfs" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -165,18 +165,18 @@
         <div class="rowbox">
           <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="gdmj">
+                <el-input placeholder="输入供地面积" v-model="info.gdmj" />
               </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="zlcf">
+                <el-input placeholder="输入租赁厂房面积" v-model="info.zlcf" />
               </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="lztd">
+                <el-input placeholder="输入流转土地面积" v-model="info.lztd" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -187,38 +187,38 @@
         <div class="rowbox">
           <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="sjtzze">
+                <el-input placeholder="输入实际投资总额" v-model="info.sjtzze" />
               </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="sjgdzctze">
+                <el-input placeholder="输入实际固定资产投资额" v-model="info.sjgdzctze" />
               </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="mjtzqd">
+                <el-input placeholder="输入亩均投资强度" v-model="info.mjtzqd" />
               </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="mjsr">
+                <el-input placeholder="输入亩均收入" v-model="info.mjsr" />
               </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="yjncz">
+                <el-input placeholder="输入预计年产值" v-model="info.yjncz" />
               </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="yjls">
+                <el-input placeholder="输入预计利税" v-model="info.yjls" />
               </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="tzhszq">
+                <el-input placeholder="输入投资回收周期" v-model="info.tzhszq" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -266,6 +266,10 @@
         </div>
       </div>
     </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>
+    </div>
   </div>
 
 </template>
@@ -276,7 +280,8 @@ export default {
     info: {
       type: Object,
       default: null
-    }
+    },
+
   },
   data() {
     return {
@@ -312,6 +317,16 @@ export default {
         // ]
       }
     }
+  },
+  mounted() {
+    // this.$nextTick(() => {
+    //   this.initChart()
+    // })
+  },
+  methods:{
+    getSubmit(){
+      console.log(11)
+    }
   }
 }
 </script>

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

@@ -66,6 +66,7 @@
                       type="year"
                       placeholder="选择年">
                     </el-date-picker>
+
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -153,6 +154,10 @@
         </div>
       </div>
     </el-form>
+    <div class="flexcc pt7">
+        <!-- <el-button type="primary" plain>暂存</el-button> -->
+         <el-button type="primary"  style="margin-left: 26px;">提交</el-button>
+    </div>
   </div>
 
 </template>

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

@@ -113,7 +113,7 @@
 
 <script>
 // import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api/system/notice"
-import { listQyxx, getQyxx, delQyxx, addQyxx, updateQyxx } from "@/api/zhaoshang/qyxx"
+import { listQyxx, getQyxx, delQyxx, addQyxx, updateQyxx } from "@/api/zhaoshang/qyxx" 
 import firstInfoForm from "./firstInfoForm"
 import boxlist from "./boxlist.vue"
 export default {

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

@@ -110,6 +110,10 @@
         </div>
       </div>
     </el-form>
+    <div class="flexcc pt7">
+        <!-- <el-button type="primary" plain>暂存</el-button> -->
+         <el-button type="primary"  style="margin-left: 26px;">提交</el-button>
+    </div>
   </div>
 
 </template>

+ 4 - 0
src/views/project/thirdInfoForm.vue

@@ -182,6 +182,10 @@
         </div>
       </div>
     </el-form>
+    <div class="flexcc pt7">
+        <!-- <el-button type="primary" plain>暂存</el-button> -->
+         <el-button type="primary"  style="margin-left: 26px;">提交</el-button>
+    </div>
     <el-dialog  :visible.sync="dialogFormVisible">
       <template slot="title">
        <div class="ftop flexc diaboxt">