Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI

src/components/Pagination/index.vue

@@ -36,7 +36,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [10, 20, 30, 50]
+        return [10, 20, 30, 50,100,200,300]
       }
     },
     // 移动端页码按钮的数量端默认值5

src/views/components/course/userCourseCatalogDetails.vue

@@ -167,6 +167,12 @@
           <el-radio v-model="form.isProduct" :label=0>否</el-radio>
           <el-radio v-model="form.isProduct" :label=1>是</el-radio>
         </el-form-item>
+        <el-form-item label="是否先导课" prop="isFirst">
+          <el-radio-group v-model="form.isFirst">
+            <el-radio :label="1">是</el-radio>
+            <el-radio :label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="商品选择" v-if="form.isProduct === 1">
           <el-button size="small" type="primary" @click="chooseCourseProduct">选取商品</el-button>
           <el-table border width="100%" style="margin-top:5px;" :data="form.courseProducts">
@@ -687,6 +693,7 @@ export default {
         isTranscode: 0,
         transcodeFileKey: null,
         isProduct: 0,
+        isFirst: 0,
         listingStartTime: null,
         listingEndTime: null,
       };

src/views/his/storeOrder/order1.vue

@@ -292,6 +292,17 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item label="所属小程序" prop="coursePlaySourceConfigId">
+        <el-select v-model="queryParams.coursePlaySourceConfigId" placeholder="请选择所属小程序" clearable size="small">
+          <el-option
+            v-for="dict in appMallOptions"
+            :key="dict.id"
+            :label="dict.name + '(' + dict.appid + ')'"
+            :value="dict.id"
+          />
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="下单时间" prop="createTime">
             <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="changeTime"></el-date-picker>
       </el-form-item>
@@ -474,8 +485,8 @@
       <el-table ref="orderTable" height="500" v-loading="loading" border :data="orderList" @selection-change="handleSelectionChange"
         @sort-change="handleSortChange" :default-sort="{prop: 'createTime', order: 'descending'}">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="ERP电话" align="center" prop="erpPhone" v-if="SFDFopen && orderStatus!=null && orderStatus != 1"/>
-        <el-table-column label="ERP账号" align="center" prop="erpAccount" v-if="SFDFopen && orderStatus!=null && orderStatus != 1"/>
+        <el-table-column label="ERP电话" align="center" prop="erpPhone" width="120px" v-if="SFDFopen && orderStatus!=null && orderStatus != 1"/>
+        <el-table-column label="ERP账号" align="center" prop="erpAccount" width="120px" v-if="SFDFopen && orderStatus!=null && orderStatus != 1"/>
         <el-table-column label="处方单编号" align="center" prop="prescribeCode" width="180px"/>
         <el-table-column label="药品订单号" align="center" prop="orderCode" width="180px"/>
         <el-table-column label="所属公司" align="center" prop="companyName" />
@@ -486,6 +497,7 @@
           </template>
         </el-table-column>
         <el-table-column label="店铺名称" align="center" prop="storeName" />
+        <el-table-column label="小程序名称" align="center" prop="miniProgramName" width="120px" />
         <el-table-column label="就诊人" align="center" prop="patientName" />
         <el-table-column label="收货人" align="center" prop="userName" />
         <el-table-column label="套餐名称" align="center" prop="packageName" width="100px" sortable="custom" :sort-orders="['ascending', 'descending']">
@@ -534,7 +546,7 @@
                 <dict-tag :options="deliveryPayStatusOptions" :value="scope.row.deliveryPayStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100px" fixed="right">
           <template slot-scope="scope">
               <el-button
                   size="mini"
@@ -751,9 +763,6 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="包裹数量">
-            <el-input-number v-model="erpAccountForm.parcelQuantity"  :min="1" :max="10" label="发货包裹数量(默认1)"></el-input-number>            
-          </el-form-item>
         </el-form>
         
         <!-- 订单统计信息 -->
@@ -851,6 +860,7 @@ import { treeselect } from "@/api/company/companyDept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getTask } from "@/api/common";
+import {list as getAppMallOptions} from '@/api/course/coursePlaySourceConfig';
 export default {
   name: "Order",
   components: { storeOrderDetails,Treeselect  },
@@ -903,8 +913,7 @@ export default {
       erpAccountList: [], // ERP账户列表
       erpAccountQueryList:[], // ERP账户查询条件列表
       erpAccountForm: {
-        selectedAccount: [], // 选中的账户ID
-        parcelQuantity:1
+        selectedAccount: [] // 选中的账户ID
       },
       orderSummary: null, // 订单统计信息
       erpPhoneValue:[],
@@ -989,6 +998,7 @@ export default {
         { key: 'companyName', label: '所属公司', checked: true },
         { key: 'companyUserNickName', label: '所属销售', checked: true },
         { key: 'storeName', label: '店铺名称', checked: true },
+        { key: 'miniProgramName', label: '小程序名称', checked: true },
         { key: 'orderType', label: '订单类型', checked: false },
         { key: 'userName', label: '收货人姓名', checked: true },
         { key: 'userPhone', label: '收货人电话', checked: true },
@@ -1033,6 +1043,8 @@ export default {
         { key: 'packageCateName', label: '套餐包分类', checked: false },
         { key: 'age', label: '年龄', checked: false },
         { key: 'sex', label: '性别', checked: false },
+        { key: 'erpPhone', label: 'ERP电话', checked: false },
+        { key: 'erpAccount', label: 'ERP账号', checked: false },
         { key: 'source', label: '订单来源', checked: false }
       ],
       // 已选择的导出字段
@@ -1121,6 +1133,7 @@ export default {
 		    source:null,
         companyId:null,
         companyIds:null,
+        coursePlaySourceConfigId:null,
       },
       // 表单参数
       form: {},
@@ -1140,6 +1153,7 @@ export default {
        storeOPtions:[],
        deliveryPayStatusOptions:[],
        deliveryStatusOptions:[],
+       appMallOptions:[],
     };
   },
   created() {
@@ -1204,6 +1218,7 @@ export default {
           this.deliveryStatusOptions = response.data;
     });
     this.getErpAccountList();
+    this.getAppMallOptions();
   },
   methods: {
     // 新增排序处理方法
@@ -1548,15 +1563,17 @@ export default {
           this.executeCreateErpOrder();
         });
       }
+      this.getList();
     },
 
     async executSetErpOrder() {
       this.erpAccountDialog.submitting = true;
+      
       try {
         let param = {
-          loginAccount: this.erpAccountForm.selectedAccount,
-          parcelQuantity: this.erpAccountForm.parcelQuantity
+          loginAccount: this.erpAccountForm.selectedAccount
         };
+        
         if (this.ids.length > 0) {
           // 如果有选中的订单，只推送选中的
           param.orderIds = this.ids;
@@ -1606,7 +1623,6 @@ export default {
       } finally {
         this.erpAccountDialog.submitting = false;
       }
-      this.erpAccountForm.parcelQuantity = 1
     },
     
     //执行创建ERP订单
@@ -1615,8 +1631,7 @@ export default {
       
       try {
         let param = {
-          loginAccount: this.erpAccountForm.selectedAccount,
-          parcelQuantity: this.erpAccountForm.parcelQuantity
+          loginAccount: this.erpAccountForm.selectedAccount
         };
         
         if (this.ids.length > 0) {
@@ -1668,7 +1683,6 @@ export default {
       } finally {
         this.erpAccountDialog.submitting = false;
       }
-      this.erpAccountForm.parcelQuantity = 1
     },
     
     // 新增：取消ERP账户选择对话框
@@ -2250,7 +2264,7 @@ export default {
       this.unselectAllFields();
       // 然后选择常用字段
       const defaultFields = ['orderCode', 'prescribeCode', 'companyName', 'companyUserNickName', 
-                           'storeName', 'userName', 'userPhone', 'userAddress', 'totalPrice', 
+                           'storeName', 'miniProgramName', 'userName', 'userPhone', 'userAddress', 'totalPrice', 
                            'totalNum', 'payPrice', 'payMoney', 'createTime', 'payTime', 
                            'payType', 'status', 'packageName', 'patientName'];
       this.exportFieldOptions.forEach(field => {
@@ -2298,32 +2312,31 @@ export default {
       // 处理查询参数
       if(this.payTypeArr.length>0){
         this.queryParams.payType=this.payTypeArr.toString();
-      }
-      else{
+      } else {
         this.queryParams.payType=null
       }
+      
       if(this.scheduleIdArr.length>0){
         this.queryParams.scheduleId=this.scheduleIdArr.toString();
-      }
-      else{
+      } else {
         this.queryParams.scheduleId=null
       }
+      
       if(this.buyTypeArr.length>0){
         this.queryParams.orderBuyType=this.buyTypeArr.toString();
-      }
-      else{
+      } else {
         this.queryParams.orderbuyType=null
       }
+      
       if(this.channelArr.length>0){
         this.queryParams.orderChannel=this.channelArr.toString();
-      }
-      else{
+      } else {
         this.queryParams.orderChannel=null
       }
+      
       if(this.qwSubjectArr.length>0){
         this.queryParams.qwSubject=this.qwSubjectArr.toString();
-      }
-      else{
+      } else {
         this.queryParams.qwSubject=null
       }
       
@@ -2410,6 +2423,12 @@ export default {
           this.queryParams.deptId=val;
           this.getList();
     },
+    // 获取小程序选项列表
+    getAppMallOptions() {
+      getAppMallOptions({pageNum:1,pageSize:100,isMall:1}).then(response => {
+        this.appMallOptions = response.rows;
+      })
+    },
   }
 };
 </script>
@@ -2490,6 +2509,15 @@ export default {
   padding: 8px 0;
 }
 
+/* 表格布局优化 */
+.el-table {
+  min-width: 100%;
+  table-layout: fixed;
+}
+
+.el-table .el-table__body-wrapper {
+  overflow-x: auto;
+}
 
 .tip-text {
   display: flex;
@@ -2558,43 +2586,4 @@ export default {
     gap: 8px;
   }
 }
-
-/* 导出字段选择弹窗样式 */
-.field-selection-container {
-  max-height: 400px;
-  overflow-y: auto;
-  border: 1px solid #e4e7ed;
-  border-radius: 4px;
-  padding: 16px;
-  background-color: #fafafa;
-}
-
-.field-selection-container .el-checkbox {
-  display: flex;
-  align-items: center;
-  margin-right: 0;
-  margin-bottom: 8px;
-  padding: 8px 12px;
-  border-radius: 4px;
-  transition: background-color 0.3s;
-}
-
-.field-selection-container .el-checkbox:hover {
-  background-color: #f0f2f5;
-}
-
-.field-selection-container .el-checkbox.is-checked {
-  background-color: #e6f7ff;
-  border: 1px solid #91d5ff;
-}
-
-.field-count-info {
-  font-size: 14px;
-  color: #606266;
-}
-
-.field-count-info i {
-  margin-right: 8px;
-  color: #409EFF;
-}
 </style>

src/views/his/storeOrder/order2.vue

@@ -79,7 +79,6 @@
       </el-form-item>
 
 
-
         <el-form-item label="创建时间" prop="createTime">
            <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
         </el-form-item>
@@ -186,6 +185,7 @@ import { listPrescribe, getPrescribe, delPrescribe, addPrescribe, updatePrescrib
 import prescribeDetails from '../../components/his/prescribeDetails.vue';
 import {allList}from "@/api/company/company";
 import { getTask } from "@/api/common";
+import {list as getAppMallOptions} from '@/api/course/coursePlaySourceConfig';
 export default {
   name: "Prescribe",
   components: { prescribeDetails },
@@ -255,7 +255,8 @@ export default {
         auditSTime:null,
         auditETime:null,
         doctorName:null,
-        orderStatus:null
+        orderStatus:null,
+        appId:null
       },
        actName:"10",
       // 表单参数
@@ -267,6 +268,7 @@ export default {
       prescribeType:[],
       orOptions:[],
       sexOptions:[],
+      appMallOptions:[],
     };
   },
   created() {
@@ -287,9 +289,15 @@ export default {
         this.orderStatusOptions = response.data;
       });
 
+    this.getAppMallOptions();
     this.getList();
   },
   methods: {
+    getAppMallOptions() {
+      getAppMallOptions({pageNum:1,pageSize:100,isMall:1}).then(response => {
+        this.appMallOptions = response.rows;
+      })
+    },
     getAllCompany() {
       allList().then(response => {
         this.companyList = response.rows;