1. 新增字段

src/views/distribution/personnelMr/dialog/addAndEdit.vue

@@ -50,6 +50,9 @@
           />
           <span style="font-size: 12px;color: #777;">注：负责人姓名必须与微信实名信息一致</span>
         </el-form-item>
+        <el-form-item label="岗位" prop="postLabel">
+          <el-input v-model="form.postLabel" placeholder="请输入岗位"></el-input>
+        </el-form-item>
         <el-form-item label="销售人员:" prop="salePerson">
           <el-input
             v-model="form.salePerson"
@@ -150,6 +153,7 @@ export default {
         allowWithdraw: [{ required: true, message: "请选择是否可提现", trigger: ["change","blur"] }],
         //parentId: [{ required: true, message: "请选择上级分销人员", trigger: ["change","blur"] }],
         salePerson: [{ required: true, message: "请输入销售人员名称", trigger: ["change","blur"] }],
+        postLabel: [{ required: false, message: "请输入岗位", trigger: ["change","blur"] }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",
@@ -202,6 +206,7 @@ export default {
           this.$set(this.form, 'parentName', obj.parentName);
           this.$set(this.form, 'parentId', obj.parentId && obj.parentId != 0 ? obj.parentId : null);
           this.$set(this.form, 'salePerson', obj.salePerson);
+          this.$set(this.form, 'postLabel', obj.postLabel);
         });
       });
       
@@ -246,6 +251,7 @@ export default {
       this.$set(this.form, 'password', '');
       this.$set(this.form, 'parentId', '');
       this.$set(this.form, 'salePerson', '');
+      this.$set(this.form, 'postLabel', '');
     },
     /**
      * 关闭弹框

src/views/finance/refundMr/dialog/details.vue

@@ -36,6 +36,9 @@
         <el-col :span="24">
           <div class="grid-content bg-purple item-class">状态: <span>{{ statusList[form.status] }}</span></div>
         </el-col>
+        <el-col :span="24">
+          <div class="grid-content bg-purple item-class">备注: <span>{{ form.remark }}</span></div>
+        </el-col>
         <el-col :span="24" v-if="form.status == 2">
           <div class="grid-content bg-purple item-class">驳回原因: <span style="color: red;">{{ form.errReason }}</span></div>
         </el-col>

src/views/order/orderMr/dialog/details.vue

@@ -56,8 +56,14 @@
         <el-col :span="12">
           <div class="grid-content bg-purple item-class">购票数量: <span>{{ form.viewerNum || '' }}</span></div>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <div class="grid-content bg-purple item-class">支付总额: <span>￥{{ form.orderPrice || '' }}</span></div>
+        </el-col> -->
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">应付金额: <span>￥{{ form.orderPrice || '' }}</span></div>
+        </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">实付金额: <span>￥{{ form.realPrice || '' }}</span></div>
         </el-col>
         <el-col :span="12">
           <div class="grid-content bg-purple item-class">下单时间: <span>{{ form.createTime || '' }}</span></div>

src/views/order/orderMr/index.vue

@@ -177,11 +177,16 @@
       </el-table-column>
       <el-table-column label="下单时间" align="center" prop="createTime" />
       <el-table-column label="购票数量" align="center" prop="quantity" />
-      <el-table-column label="支付总额" align="center" prop="orderPrice">
+      <el-table-column label="应付金额" align="center" prop="orderPrice">
         <template slot-scope="scope">
           <span>￥{{ scope.row.orderPrice }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="实付金额" align="center" prop="realPrice">
+        <template slot-scope="scope">
+          <span>￥{{ scope.row.realPrice }}</span>
+        </template>
+      </el-table-column>
 <!--      <el-table-column label="优惠信息" align="center" prop="refundReason" />-->
       <el-table-column label="支付方式" align="center" prop="payWay">
         <template slot-scope="scope">

src/views/order/viewers/index.vue

@@ -103,7 +103,6 @@
           <dict-tag :options="dict.type.pay_way_type" :value="scope.row.payWay" />
         </template>
       </el-table-column>
-      <el-table-column label="支付时间" align="center" prop="createTime" />
       <el-table-column label="支付时间" align="center" prop="payTime" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.payTime) }}</span>

src/views/system/user/index.vue

@@ -294,6 +294,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="所属窗口">
+              <el-input v-model="form.windowId" placeholder="请输入所属窗口"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
@@ -521,6 +528,7 @@ export default {
         sex: undefined,
         status: "0",
         remark: undefined,
+        windowId: undefined,
         postIds: [],
         roleIds: []
       };

src/views/venue/venueMr/dialog/addAndEdit.vue

@@ -80,6 +80,14 @@
             style="width: 100%;"
           />
         </el-form-item>
+        <el-form-item label="容纳人数" prop="capacityNum">
+          <el-input
+            v-model="form.capacityNum"
+            placeholder="容纳人数"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
         <el-form-item label="场馆位置" prop="address">
           <span>{{form.address}}</span>
           <el-button v-if="openType != 'see'" type="text" style="padding-left: 10px" @click="initMapConfirm">去标注</el-button>
@@ -175,6 +183,7 @@ export default {
           { validator: isPhoneService, trigger: 'blur' }
         ],
         address: [{ required: true, message: "请选择场馆位置", trigger: ["change","blur"] }],
+        capacityNum: [{ required: false, message: "请输入容纳人数", trigger: ["change","blur"] }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",
@@ -235,6 +244,7 @@ export default {
           this.$set(this.form, 'contactMobile', obj.contactMobile);
           this.$set(this.form, 'customerServiceMobile', obj.customerServiceMobile);
           this.$set(this.form, 'address', obj.address);
+          this.$set(this.form, 'capacityNum', obj.capacityNum);
         });
       });
     },
@@ -300,6 +310,8 @@ export default {
       this.$set(this.form, 'contactMobile', "");
       this.$set(this.form, 'customerServiceMobile', "");
       this.$set(this.form, 'address', "");
+      this.$set(this.form, 'capacityNum', "");
+      
     },
     /**
      * 关闭弹框