前端代码同步

ruoyi-ui/src/api/projectInfo/info.js

@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+// 确认审核
+export function setPass(data) {
+  return request({
+    url: '/bmProject/project/pass',
+    method: 'post',
+    data: data
+  })
+}
 // 审核/提交项目
 export function setExamine(data) {
   return request({

ruoyi-ui/src/api/statistical/index.js

@@ -1,5 +1,13 @@
 import request  from '@/utils/request'
 
+// 确认审核
+export function setPass(data) {
+  return request({
+    url: '/bmProject/project/pass',
+    method: 'post',
+    data: data
+  })
+}
 // 在谈线索-柱状图
 export function getIndexEharts(query) {
   return request({

ruoyi-ui/src/api/system/signContract.js

@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+// 查询角色列表
+export function getOrderinfo(bmProjectId) {
+  return request({
+    url: `projectOrderInfo/orderinfo/${bmProjectId}`,
+    method: 'get',
+  })
+}
+// 股东构成-列表
+export function getShareholderList(query) {
+  return request({
+    url: `shareholder/shareholder/list`,
+    method: 'get',
+    params: query
+  })
+}

ruoyi-ui/src/components/ProjectDec/SignContract.vue

@@ -1,35 +1,47 @@
 <template>
   <div class="sign_box">
-    <el-form label-position="right" ref="form" :model="form" label-width="80px">
+    <el-form label-position="right" ref="form" :rules="rules" :model="form" label-width="80px">
+      <el-row :gutter="10" class="mb8 roiyy">
+        <el-col :span="1.5">
+          <el-button type="primary" v-hasPermi="['system:config:add']" @click="submitForm">提交</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="primary" v-hasPermi="['system:config:edit']">暂存</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="primary" v-hasPermi="['system:config:edit']">取消</el-button>
+        </el-col>
+        <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
+      </el-row>
       <div class="sign_tit">
         项目签约信息
       </div>
       <el-row>
-        <el-form-item label-width="120px" label="活动名称:" class="elItem" prop="date1">
+        <el-form-item label-width="120px" label="签约日期:" class="elItem" prop="orderDate">
           <el-col :span="6">
-            <el-date-picker type="date" placeholder="请选择签约日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+            <el-date-picker type="date" placeholder="请选择签约日期" v-model="form.orderDate" style="width: 100%;"></el-date-picker>
           </el-col>
         </el-form-item>
       </el-row>
       <el-row>
         <el-col :span="6">
-          <el-form-item label-width="120px" label="投资方式:" class="elItem" prop="tz">
+          <el-form-item label-width="120px" label="投资方式:" class="elItem" prop="investmentType">
             <el-col :span="24">
-              <el-radio-group v-model="form.resource" style="width: 100%;">
+              <el-radio-group v-model="form.investmentType" style="width: 100%;">
                 <el-col :span="12">
-                  <el-radio label="独资"></el-radio>
+                  <el-radio :value="1" label="独资"></el-radio>
                 </el-col>
                 <el-col :span="12">
-                  <el-radio label="合资"></el-radio>
+                  <el-radio :value="2" label="合资"></el-radio>
                 </el-col>
               </el-radio-group>
             </el-col>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="是否外资:" class="elItem" prop="tz1">
+          <el-form-item label="是否外资:" class="elItem" prop="isOutInvestment">
             <el-col :span="6">
-              <el-checkbox-group v-model="form.resource1">
+              <el-checkbox-group v-model="form.isOutInvestment">
                 <el-checkbox label="外资" name="type"></el-checkbox>
               </el-checkbox-group>
             </el-col>
@@ -38,9 +50,9 @@
       </el-row>
       <el-row>
         <el-col :span="7">
-          <el-form-item label-width="120px" label="总投资额度:" class="elItem" prop="je">
+          <el-form-item label-width="120px" label="总投资额度:" class="elItem" prop="totInvestment">
             <el-col :span="18">
-              <el-input type="number" placeholder="请输入总投资额度" v-model="form.je"></el-input>
+              <el-input type="number" placeholder="请输入总投资额度" v-model="form.totInvestment"></el-input>
             </el-col>
             <div class="dw_name">万元</div>
           </el-form-item>
@@ -51,33 +63,33 @@
           <div class="qz_name">其中</div>
         </el-col>
         <el-col :span="10">
-          <el-form-item label-width="182px" label="境外投资(含港澳台投资):" class="elItem" prop="je">
+          <el-form-item label-width="182px" label="境外投资(含港澳台投资):" class="elItem" prop="overseasInvestment">
             <el-col :span="18">
-              <el-input type="number" placeholder="请输入总投资额度" v-model="form.je"></el-input>
+              <el-input type="number" placeholder="请输入总投资额度" v-model="form.overseasInvestment"></el-input>
             </el-col>
             <div class="dw_name">万元</div>
           </el-form-item>
-          <el-form-item label-width="182px" label="境内省外投资:" class="elItem" prop="je">
+          <el-form-item label-width="182px" label="境内省外投资:" class="elItem" prop="jnswInvestm">
             <el-col :span="18">
-              <el-input type="number" placeholder="请输入境内省外投资额度" v-model="form.je"></el-input>
+              <el-input type="number" placeholder="请输入境内省外投资额度" v-model="form.jnswInvestm"></el-input>
             </el-col>
             <div class="dw_name">万元</div>
           </el-form-item>
-          <el-form-item label-width="182px" label="省内市外投资:" class="elItem" prop="je">
+          <el-form-item label-width="182px" label="省内市外投资:" class="elItem" prop="snswInvestm">
             <el-col :span="18">
-              <el-input type="number" placeholder="请输入省内市外投资额度" v-model="form.je"></el-input>
+              <el-input type="number" placeholder="请输入省内市外投资额度" v-model="form.snswInvestm"></el-input>
             </el-col>
             <div class="dw_name">万元</div>
           </el-form-item>
-          <el-form-item label-width="182px" label="市内县外投资:" class="elItem" prop="je">
+          <el-form-item label-width="182px" label="市内县外投资:" class="elItem" prop="snxwInvestm">
             <el-col :span="18">
-              <el-input type="number" placeholder="请输入市内县外投资额度" v-model="form.je"></el-input>
+              <el-input type="number" placeholder="请输入市内县外投资额度" v-model="form.snxwInvestm"></el-input>
             </el-col>
             <div class="dw_name">万元</div>
           </el-form-item>
-          <el-form-item label-width="182px" label="县内投资:" class="elItem" prop="je">
+          <el-form-item label-width="182px" label="县内投资:" class="elItem" prop="xnInvestm">
             <el-col :span="18">
-              <el-input type="number" placeholder="请输入县内投资额度" v-model="form.je"></el-input>
+              <el-input type="number" placeholder="请输入县内投资额度" v-model="form.xnInvestm"></el-input>
             </el-col>
             <div class="dw_name">万元</div>
           </el-form-item>
@@ -85,28 +97,28 @@
       </el-row>
       <el-row>
         <el-col :span="5">
-          <el-form-item label-width="121px" label="是否独立供地:" class="elItem" prop="je">
-            <el-select v-model="form.region" placeholder="请选择">
-              <el-option label="是" value="shanghai"></el-option>
-              <el-option label="否" value="beijing"></el-option>
+          <el-form-item label-width="121px" label="是否独立供地:" class="elItem" prop="isIndependentLan">
+            <el-select v-model="form.isIndependentLan" placeholder="请选择">
+              <el-option label="是" value="Y"></el-option>
+              <el-option label="否" value="N"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label-width="93px" label="供地面积:" class="elItem" prop="je">
+          <el-form-item label-width="93px" label="供地面积:" class="elItem" prop="landArea">
             <el-col :span="20">
-              <el-input placeholder="请输入供地面积" v-model="form.gdmj"></el-input>
+              <el-input placeholder="请输入供地面积" v-model="form.landArea"></el-input>
             </el-col>
             <div class="dw_name">亩</div>
           </el-form-item>
         </el-col>
         <el-col :span="9">
-          <el-form-item label-width="93px" label="供地位置:" class="elItem" prop="je">
-            <el-input placeholder="请输入供地位置" v-model="form.gdmj"></el-input>
+          <el-form-item label-width="93px" label="供地位置:" class="elItem" prop="landAddress">
+            <el-input placeholder="请输入供地位置" v-model="form.landAddress"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label-width="82px" label="土地证:" class="elItem" prop="je">
+          <el-form-item label-width="82px" label="土地证:" class="elItem" prop="landPhoto">
             <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
@@ -115,27 +127,27 @@
       </el-row>
       <el-row>
         <el-col :span="6">
-          <el-form-item label-width="121px" label="流转土地面积:" class="elItem" prop="je">
+          <el-form-item label-width="121px" label="流转土地面积:" class="elItem" prop="circulationLand">
             <el-col :span="18">
-              <el-input placeholder="请输入" v-model="form.gdmj"></el-input>
+              <el-input placeholder="请输入" v-model="form.circulationLand"></el-input>
             </el-col>
             <div class="dw_name">亩</div>
           </el-form-item>
         </el-col>
         <el-col :span="10">
-          <el-form-item label-width="111px" label="流转土地位置:" class="elItem" prop="je">
-            <el-input placeholder="请输入流转土地位置" v-model="form.gdmj"></el-input>
+          <el-form-item label-width="111px" label="流转土地位置:" class="elItem" prop="circulationAddres">
+            <el-input placeholder="请输入流转土地位置" v-model="form.circulationAddres"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label-width="119px" label="土地流转合同:" class="elItem" prop="je">
+          <el-form-item label-width="119px" label="土地流转合同:" class="elItem" prop="circulationDoc">
             <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label-width="94px" label="产权证:" class="elItem" prop="je">
+          <el-form-item label-width="94px" label="产权证:" class="elItem" prop="circulationPhoto">
             <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
@@ -144,27 +156,27 @@
       </el-row>
       <el-row>
         <el-col :span="7">
-          <el-form-item label-width="121px" label="租赁厂房面积:" class="elItem" prop="je">
+          <el-form-item label-width="121px" label="租赁厂房面积:" class="elItem" prop="leasePlantArea">
             <el-col :span="16">
-              <el-input placeholder="请输入" v-model="form.gdmj"></el-input>
+              <el-input placeholder="请输入" v-model="form.leasePlantArea"></el-input>
             </el-col>
             <div class="dw_name">平方米</div>
           </el-form-item>
         </el-col>
         <el-col :span="10">
-          <el-form-item label-width="111px" label="租赁厂房位置:" class="elItem" prop="je">
-            <el-input placeholder="请输入租赁厂房位置" v-model="form.gdmj"></el-input>
+          <el-form-item label-width="111px" label="租赁厂房位置:" class="elItem" prop="leasePlantAddress">
+            <el-input placeholder="请输入租赁厂房位置" v-model="form.leasePlantAddress"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="3">
-          <el-form-item label-width="94px" label="租赁合同:" class="elItem" prop="je">
+          <el-form-item label-width="94px" label="租赁合同:" class="elItem" prop="leasePlantDoc">
             <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label-width="94px" label="产权证:" class="elItem" prop="je">
+          <el-form-item label-width="94px" label="产权证:" class="elItem" prop="leasePlantPhoto">
             <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
@@ -173,81 +185,81 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label-width="121px" label="合同约定产值:" class="elItem" prop="je">
+          <el-form-item label-width="121px" label="合同约定产值:" class="elItem" prop="agreementTot">
             <el-col :span="18">
-              <el-input placeholder="请输入" v-model="form.gdmj"></el-input>
+              <el-input placeholder="请输入" v-model="form.agreementTot"></el-input>
             </el-col>
             <div class="dw_name">万元</div>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label-width="121px" label="合同约定税收:" class="elItem" prop="je">
+          <el-form-item label-width="121px" label="合同约定税收:" class="elItem" prop="agreementTax">
             <el-col :span="18">
-              <el-input placeholder="请输入" v-model="form.gdmj"></el-input>
+              <el-input placeholder="请输入" v-model="form.agreementTax"></el-input>
             </el-col>
             <div class="dw_name">万元</div>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row style="margin-left: -10px;">
-        <el-col :span="8">
-          <el-form-item label-width="131px" label="合同约定开工时间:" class="elItem" prop="je">
+      <el-row>
+        <el-col :span="8" style="margin-left: -10px;">
+          <el-form-item label-width="148px" label="合同约定开工时间:" class="elItem" prop="agreementStartdate">
             <el-col :span="18">
-              <el-date-picker type="date" placeholder="请选择开工时间" v-model="form.date1" style="width: 100%;"></el-date-picker>
+              <el-date-picker type="date" placeholder="请选择开工时间" v-model="form.agreementStartdate" style="width: 100%;"></el-date-picker>
             </el-col>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label-width="131px" label="合同约定竣工时间:" class="elItem" prop="je">
+          <el-form-item label-width="131px" label="合同约定竣工时间:" class="elItem" prop="agreementEnddate">
             <el-col :span="18">
-              <el-date-picker type="date" placeholder="请选择竣工时间" v-model="form.date1" style="width: 100%;"></el-date-picker>
+              <el-date-picker type="date" placeholder="请选择竣工时间" v-model="form.agreementEnddate" style="width: 100%;"></el-date-picker>
             </el-col>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
-        <el-form-item label-width="121px" label="合同签约方:" class="elItem" prop="je">
+        <el-form-item label-width="121px" label="合同签约方:" class="elItem">
         </el-form-item>
       </el-row>
       <el-row>
         <el-col :span="6">
-          <el-form-item label-width="121px" label="对方:" class="elItem" prop="je">
-            <el-input placeholder="请输入对方" v-model="form.gdmj"></el-input>
+          <el-form-item label-width="121px" label="对方:" class="elItem" prop="agreementPartner">
+            <el-input placeholder="请输入对方" v-model="form.agreementPartner"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label-width="121px" label="签约人:" class="elItem" prop="je">
-            <el-input placeholder="请输入签约人" v-model="form.gdmj"></el-input>
+          <el-form-item label-width="121px" label="签约人:" class="elItem" prop="partner">
+            <el-input placeholder="请输入签约人" v-model="form.partner"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="6">
-          <el-form-item label-width="121px" label="我方:" class="elItem" prop="je">
-            <el-input placeholder="请输入我方" v-model="form.gdmj"></el-input>
+          <el-form-item label-width="121px" label="我方:" class="elItem" prop="agreementUs">
+            <el-input placeholder="请输入我方" v-model="form.agreementUs"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label-width="121px" label="签约人:" class="elItem" prop="je">
-            <el-input placeholder="请输入签约人" v-model="form.gdmj"></el-input>
+          <el-form-item label-width="121px" label="签约人:" class="elItem" prop="signUs">
+            <el-input placeholder="请输入签约人" v-model="form.signUs"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="6">
-          <el-form-item label-width="121px" label="第三方:" class="elItem" prop="je">
-            <el-input placeholder="请输入第三方" v-model="form.gdmj"></el-input>
+          <el-form-item label-width="121px" label="第三方:" class="elItem" prop="agreementThird">
+            <el-input placeholder="请输入第三方" v-model="form.agreementThird"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label-width="121px" label="签约人:" class="elItem" prop="je">
-            <el-input placeholder="请输入签约人" v-model="form.gdmj"></el-input>
+          <el-form-item label-width="121px" label="签约人:" class="elItem" prop="third">
+            <el-input placeholder="请输入签约人" v-model="form.third"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="18">
-          <el-form-item label-width="121px" label="合同文本:" class="elItem" prop="je">
+          <el-form-item label-width="121px" label="合同文本:" class="elItem" prop="agreementUrl">
             <el-upload class="upload-demo" ref="upload" action="https://jsonplaceholder.typicode.com/posts/"
               :on-preview="handlePreview" :on-remove="handleRemove" :file-list="fileList" :auto-upload="false">
               <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
@@ -259,48 +271,48 @@
       </el-row>
       <div class="sign_tit">
         企业注册信息
-      </div>
-      <el-row>
-          <el-col :span="6" style="margin-right: -10px;">
-            <el-form-item label-width="131px" label="在潜注册公司名称:" class="elItem" prop="je">
-              <el-input placeholder="请输入在潜注册公司名称" v-model="form.gdmj"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label-width="109px" label="法定代表人:" class="elItem" prop="je">
-              <el-input placeholder="请输入法定代表人" v-model="form.gdmj"></el-input>
-            </el-form-item>
-          </el-col>
-      </el-row>
-      <el-row>
-          <el-col :span="6" style="margin-right: -10px;">
-            <el-form-item label-width="131px" label="注册资本金:" class="elItem" prop="je">
-              <el-input placeholder="请输入注册资本金" v-model="form.gdmj"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label-width="109px" label="注册地址:" class="elItem" prop="je">
-              <el-input placeholder="请输入注册地址" v-model="form.gdmj"></el-input>
-            </el-form-item>
-          </el-col>
-      </el-row>
-      <el-row>
-          <el-col :span="6" style="margin-right: -10px;">
-            <el-form-item label-width="131px" label="注册资本金:" class="elItem" prop="je">
-              <el-input placeholder="请输入注册资本金" v-model="form.gdmj"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label-width="173px" label="营业执照复印件:" class="elItem" prop="je">
-              <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/">
-                <el-button size="small" type="primary">点击上传</el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-      </el-row>
-      <div class="sign_tit">
-        企业股东构成
-      </div>
+      </div>
+      <el-row>
+        <el-col :span="6" style="margin-right: -10px;">
+          <el-form-item label-width="131px" label="在潜注册公司名称:" class="elItem" prop="name">
+            <el-input placeholder="请输入在潜注册公司名称" v-model="form.name"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label-width="109px" label="法定代表人:" class="elItem" prop="legalRep">
+            <el-input placeholder="请输入法定代表人" v-model="form.legalRep"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6" style="margin-right: -10px;">
+          <el-form-item label-width="131px" label="注册资本金:" class="elItem" prop="totMoney">
+            <el-input placeholder="请输入注册资本金" v-model="form.totMoney"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label-width="109px" label="注册地址:" class="elItem" prop="address">
+            <el-input placeholder="请输入注册地址" v-model="form.address"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6" style="margin-right: -10px;">
+          <el-form-item label-width="131px" label="统一社会信用代码:" class="elItem" prop="code">
+            <el-input placeholder="请输入注册资本金" v-model="form.code"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label-width="173px" label="营业执照复印件:" class="elItem" prop="bussinessUrl">
+            <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/">
+              <el-button size="small" type="primary">点击上传</el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="sign_tit">
+        企业股东构成
+      </div>
       <el-row>
         <div class="ads_box">
           <img src="../../assets/images/icon_add@2x.png" alt="" class="add_icon">
@@ -308,7 +320,7 @@
         </div>
       </el-row>
       <el-row>
-        <el-table v-loading="loading" class="elItem" :data="configList">
+        <el-table v-loading="loading" class="elItem" :data="shareholderList">
           <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column label="姓名" align="center" prop="configId" />
           <el-table-column label="股权比例" align="center" prop="configName" :show-overflow-tooltip="true" />
@@ -336,97 +348,333 @@
             </template>
           </el-table-column>
         </el-table>
-      </el-row>
-      <div class="sign_tit">
-        企业备案信息
-      </div>
-      <el-row>
-          <el-col :span="6">
-            <el-form-item label-width="121px" label="备案单位:" class="elItem" prop="je">
-              <el-input placeholder="请输入备案单位" v-model="form.gdmj"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label-width="109px" label="备案文号:" class="elItem" prop="je">
-              <el-input placeholder="请输入备案文号" v-model="form.gdmj"></el-input>
-            </el-form-item>
-          </el-col>
-      </el-row>
-      <el-row>
-          <el-col :span="6">
-            <el-form-item label-width="121px" label="备案总投资额:" class="elItem" prop="je">
-              <el-col :span="18">
-                <el-input placeholder="请输入备案总投资额" v-model="form.gdmj"></el-input>
-              </el-col>
-              <div class="dw_name">万元</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label-width="109px" label="备案建设周期:" class="elItem" prop="je">
-              <el-input placeholder="请输入备案建设周期" v-model="form.gdmj"></el-input>
-            </el-form-item>
-          </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="18">
-          <el-form-item label-width="121px" label="备案表:" class="elItem" prop="je">
-            <el-upload class="upload-demo" ref="upload" action="https://jsonplaceholder.typicode.com/posts/"
-              :on-preview="handlePreview" :on-remove="handleRemove" :file-list="fileList" :auto-upload="false">
-              <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-              <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
-              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
-            </el-upload>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="sign_tit">
-        企业包保服务
-      </div>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label-width="122px" label="联系领导:" class="elItem" prop="je">
-            <el-input placeholder="请输入联系领导" v-model="form.gdmj"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label-width="98px" label="联系方式:" class="elItem" prop="je">
-            <el-input placeholder="请输入联系方式" v-model="form.gdmj"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label-width="122px" label="责任单位:" class="elItem" prop="je">
-            <el-input placeholder="请输入责任单位" v-model="form.gdmj"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label-width="98px" label="责任人:" class="elItem" prop="je">
-            <el-input placeholder="请输入责任人" v-model="form.gdmj"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label-width="98px" label="联系方式:" class="elItem" prop="je">
-            <el-input placeholder="请输入联系方式" v-model="form.gdmj"></el-input>
-          </el-form-item>
-        </el-col>
+      </el-row>
+      <div class="sign_tit">
+        企业备案信息
+      </div>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label-width="121px" label="备案单位:" class="elItem" prop="recordName">
+            <el-input placeholder="请输入备案单位" v-model="form.recordName"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label-width="109px" label="备案文号:" class="elItem" prop="recordCode">
+            <el-input placeholder="请输入备案文号" v-model="form.recordCode"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label-width="121px" label="备案总投资额:" class="elItem" prop="recordTot">
+            <el-col :span="18">
+              <el-input placeholder="请输入备案总投资额" v-model="form.recordTot"></el-input>
+            </el-col>
+            <div class="dw_name">万元</div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label-width="109px" label="备案建设周期:" class="elItem" prop="recordTime">
+            <el-input placeholder="请输入备案建设周期" v-model="form.recordTime"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="18">
+          <el-form-item label-width="121px" label="备案表:" class="elItem" prop="recordUrl">
+            <el-upload class="upload-demo" ref="upload" action="https://jsonplaceholder.typicode.com/posts/"
+              :on-preview="handlePreview" :on-remove="handleRemove" :file-list="fileList" :auto-upload="false">
+              <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+              <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
+              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="sign_tit">
+        企业包保服务
+      </div>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label-width="122px" label="联系领导:" class="elItem" prop="contactLeader">
+            <el-input placeholder="请输入联系领导" v-model="form.contactLeader"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label-width="98px" label="联系方式:" class="elItem" prop="contactPhone">
+            <el-input placeholder="请输入联系方式" v-model="form.contactPhone"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label-width="122px" label="责任单位:" class="elItem" prop="contactCompany">
+            <el-input placeholder="请输入责任单位" v-model="form.contactCompany"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label-width="98px" label="责任人:" class="elItem" prop="contactPerson">
+            <el-input placeholder="请输入责任人" v-model="form.contactPerson"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label-width="98px" label="联系方式:" class="elItem" prop="contactPersonPhone">
+            <el-input placeholder="请输入联系方式" v-model="form.contactPersonPhone"></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
   </div>
 </template>
 
 <script>
+  import {
+    getOrderinfo,
+    getShareholderList
+  } from '@/api/system/signContract'
   export default {
     data() {
-      return {
-        configList: [{}],
+      return {
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          bmProjectId: ''
+        },
+        total: '',
+        shareholderList: [],
+        // showSearch: true,
+        loading: true,
+        rules: {
+          orderDate: [{
+            required: true,
+            message: '请选择签约日期',
+            trigger: 'blur'
+          }],
+          investmentType: [{
+            required: true,
+            message: '请选择投资方式',
+            trigger: 'blur'
+          }],
+          totInvestment: [{
+            required: true,
+            message: '请输入总投资额度',
+            trigger: 'blur'
+          }],
+          overseasInvestment: [{
+            required: true,
+            message: '请输入境外投资',
+            trigger: 'blur'
+          }],
+          isIndependentLan: [{
+            required: true,
+            message: '请选择是否独立供地',
+            trigger: 'blur'
+          }],
+          agreementTot: [{
+            required: true,
+            message: '请输入合同约定产值',
+            trigger: 'blur'
+          }],
+          agreementTax: [{
+            required: true,
+            message: '请输入合同约定税收',
+            trigger: 'blur'
+          }],
+          agreementStartdate: [{
+            required: true,
+            message: '请选择合同约定开工时间',
+            trigger: 'blur'
+          }],
+          agreementEnddate: [{
+            required: true,
+            message: '请选择合同约定竣工时间',
+            trigger: 'blur'
+          }],
+          agreementPartner: [{
+            required: true,
+            message: '请输入合同签约对方',
+            trigger: 'blur'
+          }],
+          partner: [{
+            required: true,
+            message: '请输入对方合同签约人',
+            trigger: 'blur'
+          }],
+          agreementUs: [{
+            required: true,
+            message: '请输入合同签约我方',
+            trigger: 'blur'
+          }],
+          signUs: [{
+            required: true,
+            message: '请输入我方合同签约人',
+            trigger: 'blur'
+          }],
+          agreementUrl: [{
+            required: true,
+            message: '请上传合同文本',
+            trigger: 'blur'
+          }],
+          name: [{
+            required: true,
+            message: '请输入在潜注册公司名称',
+            trigger: 'blur'
+          }],
+          legalRep: [{
+            required: true,
+            message: '请输入法定代表人',
+            trigger: 'blur'
+          }],
+          totMoney: [{
+            required: true,
+            message: '请输入注册资本金',
+            trigger: 'blur'
+          }],
+          address: [{
+            required: true,
+            message: '请输入注册地址',
+            trigger: 'blur'
+          }],
+          code: [{
+            required: true,
+            message: '请输入统一社会信用代码',
+            trigger: 'blur'
+          }],
+          bussinessUrl: [{
+            required: true,
+            message: '请上传营业执照',
+            trigger: 'blur'
+          }],
+          recordName: [{
+            required: true,
+            message: '请输入备案单位',
+            trigger: 'blur'
+          }],
+          recordCode: [{
+            required: true,
+            message: '请输入备案文号',
+            trigger: 'blur'
+          }],
+          recordTot: [{
+            required: true,
+            message: '请输入备案总投资额',
+            trigger: 'blur'
+          }],
+          recordTime: [{
+            required: true,
+            message: '请输入备案建设周期',
+            trigger: 'blur'
+          }],
+          recordUrl: [{
+            required: true,
+            message: '请上传备案表信息',
+            trigger: 'blur'
+          }],
+          contactLeader: [{
+            required: true,
+            message: '请输入联系领导',
+            trigger: 'blur'
+          }],
+          contactPhone: [{
+            required: true,
+            message: '请输入联系方式',
+            trigger: 'blur'
+          }],
+          contactCompany: [{
+            required: true,
+            message: '请输入责任单位',
+            trigger: 'blur'
+          }],
+          contactPerson: [{
+            required: true,
+            message: '请输入责任人',
+            trigger: 'blur'
+          }],
+          contactPersonPhone: [{
+            required: true,
+            message: '请输入责任人联系方式',
+            trigger: 'blur'
+          }],
+        },
         form: {
-          resource1: false,
+          orderDate: "", //签约日期
+          investmentType: "", //投资方式
+          isOutInvestment: "", // 是否外资(N:Y)
+          totInvestment: "", //总投资额度
+          fixedAssets: "", //固定资产投资额度
+          overseasInvestment: "", //境外投资
+          jnswInvestm: "", //境内省外投资
+          snswInvestm: "", //省内市外投资
+          snxwInvestm: "", //市内县外投资
+          xnInvestm: "", //县内投资
+          isIndependentLan: "", //是否独立供地(N:Y)
+          landArea: "", //供地面积
+          landAddress: "", //供地位置
+          landPhoto: "", //土地证ur
+          circulationLand: "", //流转土地面积
+          circulationAddres: "", //流转土地位置
+          circulationDoc: "", //土地流转合同
+          circulationPhoto: "", //产权证
+          leasePlantArea: "", //租赁厂房面积
+          leasePlantAddress: "", //租赁厂房位置
+          leasePlantDoc: "", //租赁合同
+          leasePlantPhoto: "", //租赁产权证
+          agreementTot: "", //租赁产权证
+          agreementTax: "", // 合同约定税收
+          agreementStartdate: "", // 合同约定开工时间
+          agreementEnddate: "", //合同约定竣工时间
+          agreementPartner: "", //合同签约对方
+          partner: "", //对方合同签约人
+          agreementUs: "", //合同签约我方
+          signUs: "", //我方合同签约人
+          agreementThird: "", //第三方
+          third: "", //第三方签约人
+          agreementUrl: "", //合同url
+          name: "", //在潜注册公司名称
+          legalRep: "", //法定代表人
+          totMoney: "", //注册资本金
+          address: "", //注册地址
+          code: "", //统一社会信用代码
+          bussinessUrl: "", //营业执照图片url
+          recordName: "", //备案单位
+          recordCode: "", //备案文号
+          recordTot: "", //备案总投资额
+          recordTime: "", //备案建设周期
+          recordUrl: "", //备案表url
+          contactLeader: "", //企业包服务-联系领导
+          contactPhone: "", //联系方式
+          contactCompany: "", //责任单位
+          contactPerson: "", //责任人
+          contactPersonPhone: "", //责任人联系方式
         },
         fileList: []
       }
     },
-    methods: {
+    mounted() {
+      this.queryParams.bmProjectId = this.$route.query.setid
+      this.getOrderinfo()
+      this.getShareholderList()
+    },
+    methods: {
+      getShareholderList() {
+        getShareholderList(this.queryParams).then(res => {
+          this.shareholderList = res.rows;
+          this.total = res.total;
+          this.loading = false;
+        })
+      },
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            console.log(JSON.stringify(this.form))
+          }
+        })
+      },
+      getOrderinfo() {
+        getOrderinfo(this.queryParams.bmProjectId).then(res => {
+          console.log(res)
+        })
+      },
       submitUpload() {
         this.$refs.upload.submit();
       },
@@ -441,12 +689,24 @@
 </script>
 
 <style lang="scss" scoped>
+  .roiyy {
+    position: fixed;
+    top: 180px;
+    left: 0;
+    width: 100%;
+    padding-left: 230px;
+    padding-right: 30px;
+    box-sizing: border-box;
+    z-index: 100;
+  }
+
   .ads_box {
     margin: 18px 0;
     font-size: 14px;
     color: #666;
     display: flex;
-    align-items: center;
+    align-items: center;
+    cursor: pointer;
 
     .add_icon {
       margin-right: 6px;
@@ -464,7 +724,7 @@
       border-left: 3px solid #1C84C6;
       padding: 5px 0 5px 13px;
       color: #343434;
-      line-height: 1;
+      line-height: 1;
       margin: 8px 0;
       font-weight: bold;
     }

ruoyi-ui/src/views/index.vue

@@ -13,10 +13,10 @@
               <el-table-column label="时间" align="center" prop="createTime" />
               <el-table-column label="操作" width="280" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-                  <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']" @click="dec_btn(scope.row)">查看详情</el-button>
-                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+                  <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:query']" @click="dec_btn(scope.row)">查看详情</el-button>
+                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['bmProject:project:pass']"
                     @click="infoBtn(scope.row)">确认审核</el-button>
-                  <el-button size="mini" type="text" style="background: #1C84C6;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']" @click="bh_brn(scope.row)">驳回</el-button>
+                  <el-button size="mini" type="text" style="background: #1C84C6;color: #FFF;padding: 7px;" v-hasPermi="['bmProject:project:reject']" @click="bh_brn(scope.row)">驳回</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -141,7 +141,7 @@
       dec_btn(){
 
       },
-      bh_brn(scope) {
+      bh_brn(scrop) {
         this.$confirm('是否确认驳回审核', "提醒", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -156,7 +156,7 @@
           this.msgSuccess("提交成功");
         })
       },
-      infoBtn(scope) {
+      infoBtn(scrop) {
         this.$confirm('是否确认提交审核', "提醒", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",

ruoyi-ui/src/views/management/info/index.vue

@@ -27,7 +27,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain style="background-color: #1C84C6;color: #fff;border: none;" size="mini" @click="handleAdd"
-          v-hasPermi="['projectInfo:info:add']">添加线索</el-button>
+          v-hasPermi="['bmProject:project:add']">添加线索</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
@@ -35,7 +35,7 @@
       </el-col> -->
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['projectInfo:info:remove']">销号</el-button>
+          v-hasPermi="['bmProject:project:remove']">销号</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -54,17 +54,26 @@
       <el-table-column label="项目名称" align="center" prop="name" />
       <el-table-column label="总投资金额(万)" align="center" prop="totAmt" />
       <el-table-column label="填报单位" align="center" prop="deptName" />
-      <el-table-column label="审核情况" align="center" prop="remark" />
+      <el-table-column label="审核情况" align="center">
+      <template slot-scope="scope">
+        <span v-html="scope.row.remark"></span>
+      </template>
+      </el-table-column>
       <el-table-column label="状态" align="center" prop="dictLabel" />
       <el-table-column label="填报日期" width="180" align="center" prop="createTime" />
       <el-table-column label="操作" width="280" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;"  v-hasPermi="['projectInfo:info:edit']" @click="chei(scope.row)" >查看/审核</el-button>
-          <el-button size="mini" type="text" style="background: #3FBCEF;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
-            @click="infoBtn(scope.row)">{{scope.row.projectStatus%2==1?'提交审核':'驳回'}}</el-button>
-          <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']">修改</el-button>
+          <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['bmProject:project:query']"
+            @click="chei(scope.row)">查看/审核</el-button>
+          <el-button size="mini" type="text" style="background: #4CCE51;color: #FFF;padding: 7px;" v-hasPermi="['bmProject:project:pass']"
+            @click="adoptBtn(scope.row)" v-if="scope.row.projectStatus%2==0">通过</el-button>
+            <el-button size="mini" type="text" style="background: #3FBCEF;color: #FFF;padding: 7px;" v-hasPermi="['bmProject:project:reject']"
+              @click="infoBtn(scope.row)" v-if="scope.row.projectStatus%2==0">驳回</el-button>
+        <!--  <el-button size="mini" type="text" style="background: #3FBCEF;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+            @click="infoBtn(scope.row)">{{scope.row.projectStatus%2==1?'提交审核':'驳回'}}</el-button> -->
+          <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['bmProject:project:edit']">修改</el-button>
           <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" @click="handleDelete(scope.row)"
-            v-hasPermi="['projectInfo:info:remove']">销号</el-button>
+            v-hasPermi="['bmProject:project:remove']">销号</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -192,6 +201,7 @@
     addInfo,
     updateInfo,
     listProject,
+    setPass,
     exportInfo
   } from "@/api/projectInfo/info";
   let vm = ''
@@ -304,8 +314,22 @@
       }
     },
     methods: {
+      adoptBtn(scrop) {
+        this.$confirm('是否确认通过审核', "提醒", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return setPass({
+            code: 3,
+            bmProjectId: scrop.id
+          });
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("提交成功");
+        })
+      },
       infoBtn(scrop) {
-        console.log()
         if (scrop.projectStatus % 2 == 1) {
           this.$confirm('是否确认提交审核', "提醒", {
             confirmButtonText: "确定",
@@ -485,19 +509,19 @@
         }).then(response => {
           this.download(response.msg);
         })
-      },
-      //查看
-      chei(row){
-        console.log(row)
-        this.$router.push({
-          path:'/management/row',
-          query:{
-            setid:row.id,
-            setrd:row.projectStatus
-            },
-          })
-      }
+      },
+      //查看
+      chei(row) {
+        console.log(row)
+        this.$router.push({
+          path: '/management/row',
+          query: {
+            setid: row.id,
+            setrd: row.projectStatus
+          },
+        })
+      }
 
     }
   };
-</script>
+</script>

ruoyi-ui/src/views/statistical/clue/index.vue

@@ -9,11 +9,15 @@
               <el-table-column label="时间" align="center" prop="createTime" />
               <el-table-column label="操作" width="280" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-                  <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
-                    @click="dec_btn(scope.row)">查看详情</el-button>
-                  <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
-                    @click="infoBtn(scope.row)" v-if="scope.row.projectStatus%2==1">提交审核</el-button>
-                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+                  <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:query']"
+                    @click="dec_btn(scope.row)">查看/审核</el-button>
+                    <el-button size="mini" type="text" style="background: #4CCE51;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:pass']"
+                      @click="adoptBtn(scope.row)" v-if="scope.row.projectStatus%2==0">通过</el-button>
+                      <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:reject']"
+                        @click="infoBtn(scope.row)" v-if="scope.row.projectStatus%2==0">驳回</el-button>
+                  <!-- <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:examine']"
+                    @click="infoBtn(scope.row)" v-if="scope.row.projectStatus%2==1">提交审核</el-button> -->
+                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:remove']"
                     @click="bh_brn(scope.row)">销号</el-button>
                 </template>
               </el-table-column>
@@ -65,7 +69,8 @@
     delProject,
     toBeReviewedList,
     setExamine,
-    setReject,
+    setReject,
+    setPass,
     getUnitAmountList,
     getIndexEharts
   } from '@/api/statistical'
@@ -95,7 +100,22 @@
       this.zht_fn()
       this.eharts_fn()
     },
-    methods: {
+    methods: {
+      adoptBtn(scrop) {
+        this.$confirm('是否确认通过审核', "提醒", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return setPass({
+            code: 3,
+            bmProjectId: scrop.id
+          });
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("提交成功");
+        })
+      },
       picher_fn() {
         this.eharts_fn()
       },
@@ -177,7 +197,7 @@
     scrollbar-width: none;
     /* firefox */
     -ms-overflow-style: none;
-    
+
     /* IE 10+ */
     &::-webkit-scrollbar {
       display: none;

ruoyi-ui/src/views/statistical/putProduction/index.vue

@@ -9,11 +9,11 @@
               <el-table-column label="时间" align="center" prop="createTime" />
               <el-table-column label="操作" width="280" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-                  <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+                  <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:query']"
                     @click="dec_btn(scope.row)">查看详情</el-button>
-                  <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
-                    @click="infoBtn(scope.row)" v-if="scope.row.projectStatus%2==1">提交审核</el-button>
-                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+                  <!-- <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+                    @click="infoBtn(scope.row)" v-if="scope.row.projectStatus%2==1">提交审核</el-button> -->
+                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:remove']"
                     @click="bh_brn(scope.row)">销号</el-button>
                 </template>
               </el-table-column>

ruoyi-ui/src/views/statistical/sign/index.vue

@@ -9,11 +9,15 @@
               <el-table-column label="时间" align="center" prop="createTime" />
               <el-table-column label="操作" width="280" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-                  <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
-                    @click="dec_btn(scope.row)">查看详情</el-button>
-                  <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
-                    @click="infoBtn(scope.row)">{{scope.row.projectStatus%2==1?'提交审核':'驳回'}}</el-button>
-                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+                  <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:query']"
+                    @click="dec_btn(scope.row)">查看/审核</el-button>
+                    <el-button size="mini" type="text" style="background: #4CCE51;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:pass']"
+                      @click="adoptBtn(scope.row)" v-if="scope.row.projectStatus%2==0">通过</el-button>
+                      <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:reject']"
+                        @click="infoBtn(scope.row)" v-if="scope.row.projectStatus%2==0">驳回</el-button>
+                  <!-- <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:pass']"
+                    @click="infoBtn(scope.row)">{{scope.row.projectStatus%2==1?'提交审核':'驳回'}}</el-button> -->
+                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:remove']"
                     @click="bh_brn(scope.row)">销号</el-button>
                 </template>
               </el-table-column>
@@ -85,7 +89,8 @@
     setExamine,
     setReject,
     getUnitList,
-    getUnitAmountList,
+    getUnitAmountList,
+    setPass,
     getProjectContractEharts
   } from '@/api/statistical/index.js'
   export default {
@@ -114,7 +119,22 @@
       this.zj_btn()
       this.eharts_fn()
     },
-    methods: {
+    methods: {
+      adoptBtn(scrop) {
+        this.$confirm('是否确认通过审核', "提醒", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return setPass({
+            code: 3,
+            bmProjectId: scrop.id
+          });
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("提交成功");
+        })
+      },
       picher_fn() {
         this.eharts_fn()
       },

ruoyi-ui/src/views/statistical/underConstruction/index.vue

@@ -9,11 +9,15 @@
               <el-table-column label="时间" align="center" prop="createTime" />
               <el-table-column label="操作" width="280" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-                  <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
-                    @click="dec_btn(scope.row)">查看详情</el-button>
-                  <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
-                    @click="infoBtn(scope.row)" v-if="scope.row.projectStatus%2==1">提交审核</el-button>
-                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+                  <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:query']"
+                    @click="dec_btn(scope.row)">查看/审核</el-button>
+<el-button size="mini" type="text" style="background: #4CCE51;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:pass']"
+                      @click="adoptBtn(scope.row)" v-if="scope.row.projectStatus%2==0">通过</el-button>
+                      <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:reject']"
+                        @click="infoBtn(scope.row)" v-if="scope.row.projectStatus%2==0">驳回</el-button>
+                  <!-- <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+                    @click="infoBtn(scope.row)" v-if="scope.row.projectStatus%2==1">提交审核</el-button> -->
+                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:remove']"
                     @click="bh_brn(scope.row)">销号</el-button>
                 </template>
               </el-table-column>
@@ -65,7 +69,8 @@
     delProject,
     toBeReviewedList,
     setExamine,
-    setReject,
+    setReject,
+    setPass,
     setUnitAmountList,
     getProjectUnitAmountEharts
   } from '@/api/statistical'
@@ -95,7 +100,22 @@
       this.zht_fn()
       this.eharts_fn()
     },
-    methods: {
+    methods: {
+      adoptBtn(scrop) {
+        this.$confirm('是否确认通过审核', "提醒", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return setPass({
+            code: 3,
+            bmProjectId: scrop.id
+          });
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("提交成功");
+        })
+      },
       picher_fn() {
         this.eharts_fn()
       },