暂存

src/Form/cashcouponPay/add.vue

@@ -121,11 +121,18 @@
                     </el-table-column>
                     <el-table-column
                         label="金额"
-                        width="180">
+                        width="100">
                       <template slot-scope="scope">
                         <span style="margin-left: 10px">{{ scope.row.amount?scope.row.amount:'--' }}</span>
                       </template>
                     </el-table-column>
+                    <el-table-column
+                        label="余额"
+                        width="100">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.rebate_balance?scope.row.rebate_balance:'--' }}</span>
+                      </template>
+                    </el-table-column>
                     <el-table-column
                         label="分类明细"
                     >
@@ -135,6 +142,7 @@
                     </el-table-column>
                     <el-table-column
                         label="单据时间"
+                        width="150"
                     >
                       <template slot-scope="scope">
                         <span style="margin-left: 10px">{{ scope.row.billdate?scope.row.billdate:'--' }}</span>

src/Form/cashcouponPay/edit.vue

@@ -121,11 +121,18 @@
                     </el-table-column>
                     <el-table-column
                         label="金额"
-                        width="180">
+                        width="100">
                       <template slot-scope="scope">
                         <span style="margin-left: 10px">{{ scope.row.amount?scope.row.amount:'--' }}</span>
                       </template>
                     </el-table-column>
+                    <el-table-column
+                        label="余额"
+                        width="100">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.rebate_balance?scope.row.rebate_balance:'--' }}</span>
+                      </template>
+                    </el-table-column>
                     <el-table-column
                         label="分类明细"
                     >
@@ -135,6 +142,7 @@
                     </el-table-column>
                     <el-table-column
                         label="单据时间"
+                        width="150"
                     >
                       <template slot-scope="scope">
                         <span style="margin-left: 10px">{{ scope.row.billdate?scope.row.billdate:'--' }}</span>

src/Form/marketing2/agent/add.vue

@@ -41,11 +41,11 @@
             <p class="normal-title normal-margin">合作伙伴信息</p>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.cooperationstatus === '正式'" label="合作伙伴编号:" prop="agentnum" :rules="{required:true,message:'请输入经销商编号',trigger:'blur'}">
+            <el-form-item v-if="form.cooperationstatus === '正式'" label="合作伙伴编号:" prop="agentnum" :rules="{required:true,message:'请输入合作伙伴编号',trigger:'blur'}">
               <el-input v-model="form.agentnum" placeholder="输入合作伙伴编号"
               ></el-input>
             </el-form-item>
-            <el-form-item v-else label="合作伙伴编号:" prop="agentnum" :rules="{required:false,message:'请输入经销商编号',trigger:'blur'}">
+            <el-form-item v-else label="合作伙伴编号:" prop="agentnum" :rules="{required:false,message:'请输入合作伙伴编号',trigger:'blur'}">
               <el-input v-model="form.agentnum" placeholder="输入合作伙伴编号"
               ></el-input>
             </el-form-item>
@@ -186,7 +186,7 @@ export default {
         //   { required: true, message: '请输入经销商编号', trigger: 'blur' },
         // ],
         type: [
-          { required: true, message: '请选择经销商类型', trigger: 'change' },
+          { required: true, message: '请选择合作伙伴类型', trigger: 'change' },
         ],
         cooperationstatus: [
           { required: true, message: '请选择合作状态', trigger: 'change' },

src/Form/marketing2/agent/edit.vue

@@ -54,7 +54,7 @@
               <p class="normal-title normal-margin">合作伙伴信息</p>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="合作伙伴编号" prop="agentnum" v-if="form.cooperationstatus === '正式'">
+              <el-form-item label="合作伙伴编号" prop="agentnum" v-if="form.cooperationstatus === '正式'" :rules="{required:true,message:'请输入合作伙伴编号',trigger:'blur'}">
                 <el-input :disabled="true" v-model="form.agentnum" placeholder="输入合作伙伴编号"></el-input>
               </el-form-item>
               <el-form-item v-else label="合作伙伴编号" prop="agentnum">
@@ -104,7 +104,7 @@
             </el-col>
             <el-col :span="13">
               <el-form-item label="合作状态:" prop="cooperationstatus">
-                <el-select v-model="form.cooperationstatus" placeholder="请选择" style="width: 90%" @change="cooperationstatusChange" :disabled="form.cooperationstatus === '正式'">
+                <el-select v-model="form.cooperationstatus" placeholder="请选择" style="width: 90%" @change="cooperationstatusChange" :disabled="data.cooperationstatus === '正式'">
                   <el-option
                       v-for="item in cooperationstatus"
                       :key="item.label"
@@ -120,7 +120,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-          <el-form-item label="上级经销商:">
+          <el-form-item label="上级合作伙伴:">
             <selectAgent ref="agent" @selectAgent="selectAgent" :title="title"></selectAgent>
           </el-form-item>
           </el-col>