修改合同功能

.gitignore

@@ -42,3 +42,4 @@ nbdist/
 !*/build/*.java
 !*/build/*.html
 !*/build/*.xml
+running/*

ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java

@@ -104,6 +104,7 @@ public class SysContractController extends BaseController {
             data.put("name", contract.getName());
             data.put("amount", contract.getAmount().toString());
             data.put("serveTime", contract.getServeTime() + "");
+            data.put("servePromise", contract.getServePromise());
             ajax.put("data", data);
         }
         return ajax;

ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysContract.java

@@ -72,6 +72,16 @@ public class SysContract extends BaseEntity {
      */
     private String Status;
 
+    private String servePromise;
+
+    public void setServePromise(String servePromise) {
+        this.servePromise = servePromise;
+    }
+
+    public String getServePromise() {
+        return servePromise;
+    }
+
     public Long getId() {
         return id;
     }

ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java

@@ -128,6 +128,7 @@ public class SysContractServiceImpl implements ISysContractService {
             form.setField("moneyUpper", sysContract.getAmountUpper(), true);
             form.setField("money", sysContract.getAmount().intValue() + "", true);
             form.setField("phone", sysContract.getPhone(), true);
+            form.setField("promise", sysContract.getServePromise(), true);
             form.setField("date", DateUtils.getDate(), true);
             form.setField("cusId", sysContract.getCusId(), true);
 

ruoyi-custom/src/main/resources/mapper/custom/SysContractMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="cusId"    column="cus_id"    />
         <result property="phone"    column="phone"    />
         <result property="serveTime"    column="serve_time"    />
+        <result property="servePromise"    column="serve_promise"    />
         <result property="amount"    column="amount"    />
         <result property="path"    column="path"    />
         <result property="createBy"    column="create_by"    />
@@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSysContractVo">
-        select id, status, name, phone, cus_id, serve_time, amount, path, create_by, create_time, update_by, update_time, remark from sys_contract
+        select id, status, name, phone, cus_id, serve_time, serve_promise, amount, path, create_by, create_time, update_by, update_time, remark from sys_contract
     </sql>
 
     <select id="selectSysContractList" parameterType="SysContract" resultMap="SysContractResult">
@@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cusId != null and cusId != ''">cus_id,</if>
             <if test="phone != null">phone,</if>
             <if test="serveTime != null">serve_time,</if>
+            <if test="servePromise != null">serve_promise,</if>
             <if test="amount != null">amount,</if>
             <if test="path != null">path,</if>
             <if test="createBy != null">create_by,</if>
@@ -64,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cusId != null and cusId != ''">#{cusId},</if>
             <if test="phone != null">#{phone},</if>
             <if test="serveTime != null">#{serveTime},</if>
+            <if test="servePromise != null">#{servePromise},</if>
             <if test="amount != null">#{amount},</if>
             <if test="path != null">#{path},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -82,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cusId != null and cusId != ''">cus_id = #{cusId},</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="serveTime != null">serve_time = #{serveTime},</if>
+            <if test="servePromise != null">serve_promise = #{servePromise},</if>
             <if test="amount != null">amount = #{amount},</if>
             <if test="path != null">path = #{path},</if>
             <if test="createBy != null">create_by = #{createBy},</if>

ruoyi-ui/src/views/custom/contract/index.vue

@@ -89,8 +89,8 @@
 
     <el-table v-loading="loading" :data="contractList" @selection-change="handleSelectionChange">
       <!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="合同编号" align="center" prop="id"/>
+      <el-table-column label="合同编号" align="center" prop="id" fixed="left"/>
-      <el-table-column label="合同状态" align="center" prop="status" width="80">
+      <el-table-column label="合同状态" align="center" prop="status" width="80" fixed="left">
         <template slot-scope="scope">
           <el-tag
             :type="scope.row.status === 'yes' ? 'success' : 'danger'"
@@ -99,10 +99,15 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="客户姓名" align="center" prop="name"/>
+      <el-table-column label="客户姓名" align="center" prop="name" fixed="left"/>
-      <el-table-column label="证件号" align="center" prop="cusId" width="180"/>
+      <el-table-column label="证件号" align="center" prop="cusId" width="190"/>
       <el-table-column label="电话" align="center" prop="phone" width="120"/>
       <el-table-column label="服务时间" align="center" prop="serveTime" :formatter="serveTimeFormat" width="100"/>
+      <el-table-column label="服务承诺" align="center" prop="servePromise" width="100">
+        <template slot-scope="scope">
+          {{scope.row.servePromise ? `${scope.row.servePromise}斤`: ''}}
+        </template>
+      </el-table-column>
       <el-table-column label="金额" align="center" prop="amount"/>
       <el-table-column label="签订时间" align="center" prop="updateTime" width="180"/>
       <el-table-column label="合同地址" align="center" prop="path">
@@ -113,15 +118,16 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
-          <!--          <el-button-->
+          <el-button
-          <!--            size="mini"-->
+            v-if="scope.row.status==='yes'"
-          <!--            type="text"-->
+            size="mini"
-          <!--            icon="el-icon-edit"-->
+            type="text"
-          <!--            @click="handleUpdate(scope.row)"-->
+            icon="el-icon-view"
-          <!--            v-hasPermi="['custom:contract:edit']"-->
+            @click="handleLook(scope.row.path)"
-          <!--          >修改</el-button>-->
+          >查看
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -143,13 +149,19 @@
     />
 
     <!-- 添加或修改合同对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="客户姓名" prop="name">
           <el-input v-model="form.name" placeholder="请输入客户姓名"/>
         </el-form-item>
-        <el-form-item label="电话" prop="phone">
+        <!--        <el-form-item label="电话" prop="phone">-->
-          <el-input v-model="form.phone" placeholder="请输入电话"/>
+        <!--          <el-input v-model="form.phone" placeholder="请输入电话"/>-->
+        <!--        </el-form-item>-->
+        <el-form-item label="金额" prop="amount">
+          <el-input v-model="form.amount" placeholder="请输入金额"/>
+        </el-form-item>
+        <el-form-item label="服务承诺" prop="servePromise">
+          <el-input v-model="form.servePromise" placeholder="请输入服务承诺"/>
         </el-form-item>
         <el-form-item label="服务时间" prop="serveTime">
           <el-select v-model="form.serveTime" placeholder="请选择服务时间">
@@ -161,9 +173,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="金额" prop="amount">
-          <el-input v-model="form.amount" placeholder="请输入金额"/>
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
         </el-form-item>
@@ -235,6 +244,9 @@
           amount: [
             {required: true, message: "请输入签订金额", trigger: "blur"}
           ],
+          servePromise: [
+            {required: true, message: "请输入承诺效果", trigger: "blur"}
+          ],
           serveTime: [
             {required: true, message: "请选择服务时间", trigger: "blur"}
           ]
@@ -309,7 +321,7 @@
       handleAdd() {
         this.reset();
         this.open = true;
-        this.title = "添加合同";
+        this.title = "创建合同";
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
@@ -377,12 +389,16 @@
       handleCopy(path) {
         this.copyValue = window.location.origin.replace('long', 'stsign') + path;
         const btnCopy = new Clipboard('.copyBtn');
-        // btnCopy.destroy();
         this.$message({
           message: '拷贝成功',
           type: 'success'
         });
-        // console.log(this.copyValue);
+        // btnCopy.destroy();
+      },
+      handleLook(path) {
+        const url = window.location.origin.replace('long', 'stsign') + path;
+        // const url = "http://stsign.busyinn.com" + path;
+        window.open(url, '_blank');
       }
     }
   };

ruoyi-ui/src/views/custom/signContract/index.vue

@@ -50,15 +50,15 @@
         </p>
 
         <p>第二条 合作内容及费用
-        <div class="line-rule">11、经甲乙双方协商确定，乙方向甲方购买<b>{{form.serveTimeStr}}</b>“胜唐体控瘦身指导服务”（以下简称服务）。</div>
+        <div class="line-rule">11、经甲乙双方协商确定，乙方向甲方购买 <b>{{form.serveTimeStr}}</b> “胜唐体控瘦身指导服务”（以下简称服务）。</div>
-        <div class="line-rule">12、乙方向甲方购买<b>{{form.serveTimeStr}}</b>，经甲乙双方协商确定，乙方向甲方支付疗程费用共为人民币：<b>{{form.amount}}</b>元，大写：<b>{{form.amountUpper}}</b>）。
+        <div class="line-rule">12、乙方向甲方购买 <b>{{form.serveTimeStr}}</b> ，经甲乙双方协商确定，乙方向甲方支付疗程费用共为人民币：<b>{{form.amount}}</b> 元，大写：<b>{{form.amountUpper}}</b>）。
         </div>
         </p>
 
         <p>第三条 服务期约定
         <div class="line-rule">1、服务时间阶段（服务指导期、服务跟踪期、免费咨询期）具体安排，由甲方根据乙方的实际情况与乙方协商确定。</div>
         <div class="line-rule">2、因不可抗拒的因素（如意外怀孕等）而暂停服务指导，其后续服务期限由甲乙方协商确定。</div>
-        <div class="line-rule">3、减肥需要双方的配合，在不是甲方技术问题的情况下，乙方不执行营养师的指导导致没有达到预期效果，责任由乙方承担。根据个人体质不同，在调理营养健康的前提下，健康吃瘦25-35斤
+        <div class="line-rule">3、减肥需要双方的配合，在不是甲方技术问题的情况下，乙方不执行营养师的指导导致没有达到预期效果，责任由乙方承担。根据个人体质不同，在调理营养健康的前提下，健康吃瘦 <b>{{form.servePromise}}</b> 斤
         </div>
         <div class="line-rule">
           4、乙方应按甲方制定的饮食方案来饮食，承诺在未与甲方沟通前，不擅自吃方案之外的高热量、高油、高盐、高糖等不利于健康和减脂的饮食，服务期内擅自暴食导致体重上涨，次数超过3次视为乙方主动放弃营养减脂，且甲方无需免费延长服务时间。
@@ -92,9 +92,9 @@
         if (!value) {
           return callback(new Error('姓名不能为空'))
         }
-        if (value !== this.form.name) {
+        // if (value !== this.form.name) {
-          return callback(new Error('输入姓名不匹配，请联系客服核对'))
+        //   return callback(new Error('输入姓名不匹配，请联系客服核对'))
-        }
+        // }
         callback();
       }