更新条件

src/views/accompaniment/index.vue

@@ -54,6 +54,18 @@
                     :show-all-levels="true"
                     :props="treeProps"></el-cascader>
         </el-form-item>
+        <!-- <el-form-item
+          prop="subjectId"
+        >
+          <el-select v-model="searchForm.subjectId" clearable placeholder="请选择声部">
+            <el-option
+              v-for="item in selects.subjects"
+              :value="item.id"
+              :label="item.name"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item> -->
         <el-form-item prop="rankType">
           <el-select v-model="searchForm.rankType" clearable filterable placeholder="请选择是否收费">
             <el-option :value="0" label="免费"></el-option>

src/views/businessManager/orderManager/financeManager-taoqi.vue

@@ -410,9 +410,22 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <!-- 订单类型 -->
+          <el-form-item
+            label="订单类型"
+            prop="insertOrderType"
+            :label-width="formLabelWidth"
+          >
+            <el-radio-group v-model="insertOrderType" :disabled="!isAdd">
+              <el-radio :label="1">个人订单</el-radio>
+              <el-radio :label="2">学校订单</el-radio>
+              <el-radio :label="3">其它订单</el-radio>
+            </el-radio-group>
+          </el-form-item>
           <el-form-item
             label="缴费单号"
             prop="calenderId"
+            v-if="insertOrderType == 2 || insertOrderType == 3"
             :label-width="formLabelWidth"
             :rules="[
               {
@@ -445,6 +458,7 @@
           <el-form-item
             label="学员编号"
             prop="userId"
+            v-if="insertOrderType == 1 || insertOrderType == 3"
             :label-width="formLabelWidth"
           >
             <el-input
@@ -732,6 +746,7 @@ export default {
       formLabelWidth: "100px",
       routeOrderStatus: false,
       isAdd: true,
+      insertOrderType: 1, // 订单类型  1 个人订单 2 学校订单 2 其它订单
       form: {
         routeOrganId: null,
         transNo: null,
@@ -829,7 +844,7 @@ export default {
       // 添加订单
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          let form = this.form;
+          let form = JSON.parse(JSON.stringify(this.form));
           if (!form.saleAmount && !form.serviceAmount) {
             this.$message.error("请输入销售收入或服务收入");
             return;
@@ -843,6 +858,11 @@ export default {
           }
           form.goodsJson =
             form.applyType == "SERVICE" ? null : JSON.stringify(goodsJson);
+          if(this.insertOrderType == 1) {
+            form.calenderId = null
+          } else if(this.insertOrderType == 2) {
+            form.userId = null
+          }
           routeOrderAdd(form).then((res) => {
             if (res.code == 200) {
               this.$message.success("添加成功");
@@ -873,6 +893,7 @@ export default {
       // }
       // 关闭弹窗重置验证
       this.$refs[formName].resetFields();
+      this.insertOrderType = 1
     },
     onOrderExport() {
       // 报表导出
@@ -1165,6 +1186,13 @@ export default {
                   return { id: item.goodsId, number: item.num };
                 })
               );
+            if(orderInfo.userId && !res.data.calenderId) {
+              this.insertOrderType = 1
+            } else if(res.data.calenderId && !orderInfo.userId) {
+              this.insertOrderType = 2
+            } else {
+              this.insertOrderType = 3
+            }
             this.routeOrderStatus = true;
           });
         }

src/views/businessManager/orderManager/financeManager.vue

@@ -412,10 +412,23 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <!-- 订单类型 -->
+          <el-form-item
+            label="订单类型"
+            prop="insertOrderType"
+            :label-width="formLabelWidth"
+          >
+            <el-radio-group v-model="insertOrderType" :disabled="!isAdd">
+              <el-radio :label="1">个人订单</el-radio>
+              <el-radio :label="2">学校订单</el-radio>
+              <el-radio :label="3">其它订单</el-radio>
+            </el-radio-group>
+          </el-form-item>
           <el-form-item
             label="缴费单号"
             prop="calenderId"
             :label-width="formLabelWidth"
+            v-if="insertOrderType == 2 || insertOrderType == 3"
             :rules="[
               {
                 pattern: /^[0-9]*$/,
@@ -447,6 +460,7 @@
           <el-form-item
             label="学员编号"
             prop="userId"
+            v-if="insertOrderType == 1 || insertOrderType == 3"
             :label-width="formLabelWidth"
           >
             <el-input
@@ -734,6 +748,7 @@ export default {
       formLabelWidth: "100px",
       routeOrderStatus: false,
       isAdd: true,
+      insertOrderType: 1, // 订单类型  1 个人订单 2 学校订单 2 其它订单
       form: {
         routeOrganId: null,
         transNo: null,
@@ -831,7 +846,7 @@ export default {
       // 添加订单
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          let form = this.form;
+          let form = JSON.parse(JSON.stringify(this.form));
           if (!form.saleAmount && !form.serviceAmount) {
             this.$message.error("请输入销售收入或服务收入");
             return;
@@ -845,6 +860,11 @@ export default {
           }
           form.goodsJson =
             form.applyType == "SERVICE" ? null : JSON.stringify(goodsJson);
+          if(this.insertOrderType == 1) {
+            form.calenderId = null
+          } else if(this.insertOrderType == 2) {
+            form.userId = null
+          }
           routeOrderAdd(form).then((res) => {
             if (res.code == 200) {
               this.$message.success("添加成功");
@@ -875,6 +895,7 @@ export default {
       // }
       // 关闭弹窗重置验证
       this.$refs[formName].resetFields();
+      this.insertOrderType = 1
     },
     onOrderExport() {
       // 报表导出
@@ -1167,6 +1188,14 @@ export default {
                   return { id: item.goodsId, number: item.num };
                 })
               );
+
+            if(orderInfo.userId && !res.data.calenderId) {
+              this.insertOrderType = 1
+            } else if(res.data.calenderId && !orderInfo.userId) {
+              this.insertOrderType = 2
+            } else {
+              this.insertOrderType = 3
+            }
             this.routeOrderStatus = true;
           });
         }

src/views/businessManager/orderManager/orderAudit-taoqi/orderAuditDetail.vue

@@ -55,9 +55,22 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <!-- 订单类型 -->
+      <el-form-item
+        label="订单类型"
+        prop="insertOrderType"
+        :label-width="formLabelWidth"
+      >
+        <el-radio-group v-model="insertOrderType" :disabled="!isAdd">
+          <el-radio :label="1">个人订单</el-radio>
+          <el-radio :label="2">学校订单</el-radio>
+          <el-radio :label="3">其它订单</el-radio>
+        </el-radio-group>
+      </el-form-item>
           <el-form-item
             label="缴费单号"
             prop="calenderId"
+            v-if="insertOrderType == 2 || insertOrderType == 3"
             :label-width="formLabelWidth"
              :rules="[{pattern:/^[0-9]*$/,message:'请输入正确的缴费单号',trigger: 'blur'}]"
           >
@@ -70,6 +83,7 @@
       <el-form-item
         label="学员编号"
         prop="userId"
+        v-if="insertOrderType == 1 || insertOrderType == 3"
         :label-width="formLabelWidth"
       >
         <el-input
@@ -330,6 +344,7 @@ export default {
         calenderId:''
       },
       isAdd: !this.isLook,
+      insertOrderType: 1, // 订单类型  1 个人订单 2 学校订单 2 其它订单
       cooperationList: [],
       submitForm: {
         memo: "",
@@ -369,6 +384,13 @@ export default {
             this.getShopList(orderInfo.goodsJson)
           );
           this.changeOrgin(orderInfo.routeOrganId);
+          if(orderInfo.userId && !res.data.calenderId) {
+            this.insertOrderType = 1
+          } else if(res.data.calenderId && !orderInfo.userId) {
+            this.insertOrderType = 2
+          } else {
+            this.insertOrderType = 3
+          }
           this.clearSchool = true;
         }
       });
@@ -441,7 +463,7 @@ export default {
     submitReaet() {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
-          let form = this.form;
+          let form = JSON.parse(JSON.stringify(this.form));
           if (!form.saleAmount && !form.serviceAmount) {
             this.$message.error("请输入销售收入或服务收入");
             return;
@@ -460,6 +482,11 @@ export default {
             form.applyType == "SERVICE" ? null : JSON.stringify(goodsJson);
           form.id = this.orderId;
           form.auditStatus = "ING";
+          if(this.insertOrderType == 1) {
+            form.calenderId = null
+          } else if(this.insertOrderType == 2) {
+            form.userId = null
+          }
           updateRouteOrder(form).then((res) => {
             if (res.code == 200) {
               this.$message.success("修改成功");

src/views/businessManager/orderManager/orderAudit/orderAuditDetail.vue

@@ -55,9 +55,22 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <!-- 订单类型 -->
+      <el-form-item
+        label="订单类型"
+        prop="insertOrderType"
+        :label-width="formLabelWidth"
+      >
+        <el-radio-group v-model="insertOrderType" :disabled="!isAdd">
+          <el-radio :label="1">个人订单</el-radio>
+          <el-radio :label="2">学校订单</el-radio>
+          <el-radio :label="3">其它订单</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item
         label="缴费单号"
         prop="calenderId"
+        v-if="insertOrderType == 2 || insertOrderType == 3"
         :label-width="formLabelWidth"
          :rules="[{pattern:/^[0-9]*$/,message:'请输入正确的缴费单号',trigger: 'blur'}]"
       >
@@ -70,6 +83,7 @@
       <el-form-item
         label="学员编号"
         prop="userId"
+        v-if="insertOrderType == 1 || insertOrderType == 3"
         :label-width="formLabelWidth"
       >
         <el-input
@@ -353,6 +367,7 @@ export default {
         calenderId: "",
       },
       isAdd: !this.isLook,
+      insertOrderType: 1, // 订单类型  1 个人订单 2 学校订单 2 其它订单
       cooperationList: [],
       submitForm: {
         memo: "",
@@ -395,6 +410,14 @@ export default {
             this.getShopList(orderInfo.goodsJson)
           );
           this.changeOrgin(orderInfo.routeOrganId);
+
+          if(orderInfo.userId && !res.data.calenderId) {
+            this.insertOrderType = 1
+          } else if(res.data.calenderId && !orderInfo.userId) {
+            this.insertOrderType = 2
+          } else {
+            this.insertOrderType = 3
+          }
           this.clearSchool = true;
         }
       });
@@ -467,7 +490,7 @@ export default {
     submitReaet() {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
-          let form = this.form;
+          let form = JSON.parse(JSON.stringify(this.form));
           if (!form.saleAmount && !form.serviceAmount) {
             this.$message.error("请输入销售收入或服务收入");
             return;
@@ -486,6 +509,11 @@ export default {
             form.applyType == "SERVICE" ? null : JSON.stringify(goodsJson);
           form.id = this.orderId;
           form.auditStatus = "ING";
+          if(this.insertOrderType == 1) {
+            form.calenderId = null
+          } else if(this.insertOrderType == 2) {
+            form.userId = null
+          }
           updateRouteOrder(form).then((res) => {
             if (res.code == 200) {
               this.$message.success("修改成功");