bug更新

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

@@ -792,15 +792,16 @@
       //驳回
       backBtn() {
         var that = this
-        this.$confirm("是否确认驳回", "提醒", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
+        this.$prompt("请输入驳回意见", "提醒", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
           .then(function() {
             return setReject({
               code: 2,
               bmProjectId: that.queryParams.bmProjectId,
+              remark:value
             });
           })
           .then(() => {

ruoyi-ui/src/views/under/index.vue

@@ -75,6 +75,7 @@
           <!-- class-name="small-padding fixed-width" -->
           <template slot-scope="scope">
             <el-button
+             :disabled="dis_flag"
               size="mini"
               type="warning"
               @click="handleUpdate(scope.row)"
@@ -82,6 +83,7 @@
               >修改</el-button
             >
             <el-button
+             :disabled="dis_flag"
               size="mini"
               type="danger"
               @click="handleDelete(scope.row)"
@@ -118,6 +120,7 @@
           <template slot-scope="scope">
             <el-button
               size="mini"
+               :disabled="dis_flag"
               type="warning"
               @click="handleUpdatetwo(scope.row)"
               v-hasPermi="['system:config:edit']"
@@ -125,6 +128,7 @@
             >
             <el-button
               size="mini"
+               :disabled="dis_flag"
               type="danger"
               @click="handleDeletetwo(scope.row)"
               v-hasPermi="['system:config:remove']"
@@ -144,62 +148,84 @@
         class="manager_form"
       >
         <!-- <el-form ref="queryForm" :model="queryParams" :rules="queryForm" label-width="115px" label-position="center" class="manager_form"> -->
-        <el-form-item label="投资方联系人" prop="contactor">
-          <el-input
-            v-model="queryParams.contactor"
-            placeholder="请输入投资方联系人"
-            clearable
-            size="small"
-            style="width: 223px"
-          />
-        </el-form-item>
-        <el-form-item label="投资方联系方式:" prop="phone" class="weiru">
-          <el-input
-            v-model.number="queryParams.phone"
-            placeholder="请输入联系方式"
-            clearable
-            size="small"
-            style="width: 233px"
-          />
-        </el-form-item>
-        <div class="nvestor">
-          <p>引荐方 <i>*</i></p>
-        </div>
+        <el-row>
+          <el-col :span="8">
+          <el-form-item label="投资方联系人" prop="contactor">
+            <el-input
+             :disabled="dis_flag"
+              v-model="queryParams.contactor"
+              placeholder="请输入投资方联系人"
+              clearable
+              size="small"
+              style="width: 223px"
+            />
+          </el-form-item>
+          </el-col>
+          <el-col :span="8">
+          <el-form-item label="投资方联系方式:" prop="phone" class="weiru">
+            <el-input
+             :disabled="dis_flag"
+              v-model.number="queryParams.phone"
+              placeholder="请输入联系方式"
+              clearable
+              size="small"
+              style="width: 233px"
+            />
+          </el-form-item>
+          </el-col>
+        </el-row>
 
+        <el-row>
+          <div class="nvestor">
+            <p>引荐方 <i>*</i></p>
+          </div>
+        </el-row>
+        <el-row>
         <!-- <div v-if="queryParams.referralList == null" > -->
-          <el-form-item label="引荐单位:" prop="sysDeptId"  style="width: 24%;">
+        <el-col :span="6">
+          <el-form-item label="引荐单位:" prop="sysDeptId">
             <el-cascader
+             :disabled="dis_flag"
                v-model="queryParams.referralList[0].sysDeptId"
                :show-all-levels="false"
                :options="typeOptionstwo"
                @change="handleChange"
-               style="width: 128px"
                 ></el-cascader>
           </el-form-item>
-          <el-form-item label="投资分配额:"  style="width: 18%;" class="fenpe" prop="investmentAllcocation">
+          </el-col>
+          <el-col :span="6">
+          <el-form-item label="投资分配额:" class="fenpe" prop="investmentAllcocation">
+            <el-col :span="22">
             <el-input
+             :disabled="dis_flag"
               v-model="queryParams.referralList[0].investmentAllcocation"
               placeholder="数"
               clearable
               size="small"
-              style="width:66px; padding: 0;"
               @keyup.enter.native="handleQuery"
             />
+            </el-col>
+            <el-col :span="2">
             <span class="souu">%</span>
+            </el-col>
           </el-form-item>
-          <el-form-item label="引荐方联系人:" prop="referral"   style="width: 21%;">
+          </el-col>
+          <el-col :span="6">
+          <el-form-item label="引荐方联系人:" prop="referral">
             <el-input
+             :disabled="dis_flag"
               v-model="queryParams.referralList[0].referral"
               placeholder="请输入"
               clearable
               size="small"
-              style="width: 98px"
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-
-          <el-form-item label="引荐方联系方式:" prop="referralPhone" style="width: 33%;">
+          </el-col>
+          <el-col :span="6">
+          <el-form-item label="引荐方联系方式:" prop="referralPhone">
             <el-input
+             :disabled="dis_flag"
               v-model="queryParams.referralList[0].referralPhone"
               placeholder="请输入联系方式"
               clearable
@@ -207,38 +233,52 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="引荐单位:" style="width: 24%;" prop="sysDeptId">
+          </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+          <el-form-item label="引荐单位:" prop="sysDeptId">
             <el-cascader
+             :disabled="dis_flag"
                 :show-all-levels = "false"
                 v-model="queryParams.referralList[1].sysDeptId"
                 :options="typeOptionstwo"
-                style="width: 128px"
                 @change="handleChangete"></el-cascader>
           </el-form-item>
-          <el-form-item label="投资分配额:" style="width: 18%;" class="fenpe" prop="investmentAllcocation">
+          </el-col>
+          <el-col :span="6">
+          <el-form-item label="投资分配额:" class="fenpe" prop="investmentAllcocation">
+            <el-col :span="22">
             <el-input
+             :disabled="dis_flag"
               v-model="queryParams.referralList[1].investmentAllcocation"
               placeholder="数"
               clearable
               size="small"
-              style="width:66px;padding: 0;"
               @keyup.enter.native="handleQuery"
             />
+            </el-col>
+            <el-col :span="2">
             <span class="souu">%</span>
+            </el-col>
           </el-form-item>
-          <el-form-item label="引荐方联系人:" prop="referral"  style="width: 21%;">
+          </el-col>
+          <el-col :span="6">
+          <el-form-item label="引荐方联系人:" prop="referral">
             <el-input
+             :disabled="dis_flag"
               v-model="queryParams.referralList[1].referral"
               placeholder="请输入"
               clearable
               size="small"
-              style="width: 98px"
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-
-          <el-form-item label="引荐方联系方式:" prop="referralPhone" style="width: 33%;">
+          </el-col>
+          <el-col :span="6">
+          <el-form-item label="引荐方联系方式:" prop="referralPhone">
             <el-input
+             :disabled="dis_flag"
               v-model="queryParams.referralList[1].referralPhone"
               placeholder="请输入联系方式"
               clearable
@@ -246,12 +286,19 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          </el-col>
+          </el-row>
         <!-- </div> -->
+        <el-row>
         <div class="nvestor">
           <p>项目基本信息 <i>*</i></p>
         </div>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
         <el-form-item label="预计投资额" prop="needAmt">
           <el-input
+           :disabled="dis_flag"
             v-model.number="queryParams.needAmt"
             placeholder="请输入预计投资额"
             clearable
@@ -260,12 +307,15 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
+        </el-col>
+        <el-col :span="8">
         <el-form-item
           label="其中 固定资产投资:"
           prop="fixedAssets"
           class="manager_lab"
         >
           <el-input
+           :disabled="dis_flag"
             v-model.number="queryParams.fixedAssets"
             placeholder="请输入"
             clearable
@@ -274,11 +324,16 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
+        </el-col>
+        </el-row>
+        <el-row>
         <div class="lage_div">
           <span>项目主营产品</span>
         </div>
+        </el-row>
           <el-form-item label="产品名称:" prop="productName" class="maneg_lar">
             <el-input
+             :disabled="dis_flag"
               v-model="queryParams.productName"
               placeholder="请输入产品名称"
               clearable
@@ -294,6 +349,7 @@
           class="manager_labtwo"
         >
           <el-input
+           :disabled="dis_flag"
             v-model="queryParams.productQty"
             placeholder="请输入设计产能"
             clearable
@@ -306,6 +362,7 @@
           <span>项目预计收益</span>
           <el-form-item label="预计产值:" prop="productPrice" class="maneg_lar">
             <el-input
+             :disabled="dis_flag"
               v-model.number="queryParams.productPrice"
               placeholder="请输入预计产值"
               clearable
@@ -321,6 +378,7 @@
           class="manager_labtwo"
         >
           <el-input
+           :disabled="dis_flag"
             v-model.number="queryParams.productTax"
             placeholder="请输入预计税收"
             clearable
@@ -335,6 +393,7 @@
           class="manager_labtwo"
         >
           <el-input
+           :disabled="dis_flag"
             v-model="queryParams.productEmp"
             placeholder="请输入预计用工"
             size="small"
@@ -350,6 +409,7 @@
           class="manager_labthre"
         >
           <el-input
+           :disabled="dis_flag"
             v-model="queryParams.plannedLand"
             placeholder="请输入"
             clearable
@@ -361,6 +421,7 @@
         </el-form-item>
         <el-form-item label="其中 独立供地:" prop="independentLand">
           <el-input
+           :disabled="dis_flag"
             v-model="queryParams.independentLand"
             placeholder="请输入"
             clearable
@@ -372,6 +433,7 @@
         </el-form-item>
         <el-form-item label="流转土地:" prop="circulationLan" class="mage_ter">
           <el-input
+           :disabled="dis_flag"
             v-model="queryParams.circulationLan"
             placeholder="请输入"
             clearable
@@ -387,6 +449,7 @@
           class="manager_labthre"
         >
           <el-input
+           :disabled="dis_flag"
             v-model="queryParams.needRoom"
             placeholder="请输入"
             clearable
@@ -398,6 +461,7 @@
         </el-form-item>
         <el-form-item label="其中 厂房:" prop="needFactoryRoom">
           <el-input
+           :disabled="dis_flag"
             v-model="queryParams.needFactoryRoom"
             placeholder="请输入"
             clearable
@@ -409,6 +473,7 @@
         </el-form-item>
         <el-form-item label="办公生活用房:" prop="needBusRoom" class="mage_ter">
           <el-input
+           :disabled="dis_flag"
             v-model="queryParams.needBusRoom"
             placeholder="请输入"
             clearable
@@ -420,6 +485,7 @@
         </el-form-item>
         <el-form-item label="其他需求:" prop="other" class="maget_ty">
           <el-input
+           :disabled="dis_flag"
             v-model="queryParams.other"
             placeholder="请输入项目概况"
             clearable
@@ -432,6 +498,7 @@
         </el-form-item>
         <el-form-item label="拟落户地点:" prop="address">
           <el-input
+           :disabled="dis_flag"
             v-model="queryParams.address"
             placeholder="请输入拟落户地点"
             size="small"
@@ -444,6 +511,7 @@
           class="maget_tyty"
         >
           <el-select
+           :disabled="dis_flag"
             v-model="queryParams.isFrameorder"
             placeholder="请选择是否签订框架协议"
             clearable
@@ -462,6 +530,7 @@
           <div class="forieu" style="width: 618px">
             <div class="bure burert">
               <el-upload
+               :disabled="dis_flag"
                 :action="defaultSettings.urls+'/prod-api/common/upload'"
                 :auto-upload="false"
                 ref="upload"
@@ -485,6 +554,7 @@
               </el-upload>
               <div class="ijeut">
                 <el-button
+                 :disabled="dis_flag"
                   style="margin-left: 10px; height: 32px"
                   size="small"
                   type="primary"
@@ -497,6 +567,7 @@
         </el-form-item>
         <el-form-item label="备注:" prop="description" class="maget_ty">
           <el-input
+           :disabled="dis_flag"
             v-model="queryParams.description"
             placeholder="请输入备注"
             clearable
@@ -817,11 +888,13 @@ export default {
       // id:0
       value: [],
       valuess:[],
-      values:[]
+      values:[],
+      dis_flag: false,
     };
   },
   created() {
     this.bmProjectId = this.$route.query.setid;
+    this.dis_flag = (this.$route.query.setrd!=1)
     this.jeutu.bmProjectId = this.bmProjectId
     this.setrd = this.$route.query.setrd;
     console.log(this.bmProjectId);
@@ -1139,6 +1212,9 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      if(this.dis_flag){
+        return
+      }
       this.reset();
       this.open = true;
       // this.opentwo =  true
@@ -1146,6 +1222,9 @@ export default {
       // this.titletwo = "添加参数";
     },
     handleAddtwo() {
+      if(this.dis_flag){
+        return
+      }
       this.resettwo();
       // this.open = true;
       this.opentwo = true;
@@ -1522,6 +1601,7 @@ export default {
       margin-bottom: 20px;
     }
     .enterprise_tw {
+      cursor: pointer;
       i {
         margin-right: 5px;
       }