From 93d7f2b43d02bcdc3e94b8e9872fd77b52ba9976 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 25 Jun 2024 16:58:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/school/place/index.js               |  2 +-
 src/components/Form/src/Form.vue            |  1 +
 src/views/Clue/Order/Comp/MallOrderList.vue |  2 +-
 src/views/Clue/Order/Comp/OrderList.vue     | 19 ++++++++++++++-
 src/views/Clue/Set/Comp/GeneralSet.vue      |  9 ++++++-
 src/views/Clue/Set/index.vue                |  6 ++++-
 src/views/SchoolManagement/Place/index.vue  | 26 +++++++++++++++------
 7 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/src/api/school/place/index.js b/src/api/school/place/index.js
index 6e61327..f0c1dec 100644
--- a/src/api/school/place/index.js
+++ b/src/api/school/place/index.js
@@ -35,5 +35,5 @@ export const updatePlaceStatus = async (id, status) => {
     id,
     status
   }
-  return request.put({ url: '/admin-api/crm/sch-place/update-status', data: data })
+  return request.put({ url: '/admin-api/crm/sch-place/status/update', data: data })
 }
diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index f78267d..d3a00bf 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -233,6 +233,7 @@ export default defineComponent({
                   vModel={formModel.value[item.field]}
                   {...(autoSetPlaceholder && setTextPlaceholder(item))}
                   {...setComponentProps(item)}
+                  filterable
                   format={item.component == 'DatePicker' ? 'YYYY-MM-DD' : null}
                   value-format={item.component == 'DatePicker' ? 'YYYY-MM-DD' : null}
                   style={baseSty + item.componentProps?.style}
diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue
index 689bcc0..bcb6b3c 100644
--- a/src/views/Clue/Order/Comp/MallOrderList.vue
+++ b/src/views/Clue/Order/Comp/MallOrderList.vue
@@ -152,7 +152,7 @@
             class="mr-10px"
             link
             style="padding: 0; margin-left: 0"
-            v-if="scope.row.isPayoff == false"
+            v-if="scope.row.isPayoff == '未结清'"
             v-hasPermi="['clue:order:return']"
             @click="feeBack(scope.row)"
           >
diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue
index 35c5190..58ab559 100644
--- a/src/views/Clue/Order/Comp/OrderList.vue
+++ b/src/views/Clue/Order/Comp/OrderList.vue
@@ -115,12 +115,22 @@
             class="mr-10px"
             link
             style="padding: 0; margin-left: 0"
-            v-if="scope.row.isPayoff == false"
+            v-if="scope.row.isPayoff == '未结清'"
             v-hasPermi="['clue:order:return']"
             @click="feeBack(scope.row)"
           >
             回款
           </el-button>
+          <el-button
+            type="primary"
+            class="mr-10px"
+            link
+            style="padding: 0; margin-left: 0"
+            v-hasPermi="['clue:order:add-fee']"
+            @click="handleAddFee(scope.row)"
+          >
+            添加支出
+          </el-button>
           <el-button
             type="primary"
             class="mr-10px"
@@ -139,6 +149,7 @@
     <DialogOrder ref="orderDetailDialog" />
     <DialogFeeback ref="feedbackDialog" />
     <DialogAfterSale ref="afterSaleDialog" />
+    <DialogExtraFee ref="extraFeeDialog" />
   </div>
 </template>
 
@@ -152,6 +163,7 @@ import { getClassTypePage } from '@/api/school/class'
 import DialogOrder from './DialogOrder.vue'
 import DialogFeeback from './DialogFeeback.vue'
 import DialogAfterSale from './DialogAfterSale.vue'
+import DialogExtraFee from './DialogExtraPay.vue'
 
 import { removeNullField } from '@/utils'
 
@@ -257,6 +269,11 @@ function feeBack(row) {
   feedbackDialog.value.open(row.signId)
 }
 
+const extraFeeDialog = ref()
+function handleAddFee(row) {
+  extraFeeDialog.value.open(row.signId)
+}
+
 // 取消登记
 async function cancelDeal(row) {
   try {
diff --git a/src/views/Clue/Set/Comp/GeneralSet.vue b/src/views/Clue/Set/Comp/GeneralSet.vue
index 6d6060d..7f5f92d 100644
--- a/src/views/Clue/Set/Comp/GeneralSet.vue
+++ b/src/views/Clue/Set/Comp/GeneralSet.vue
@@ -18,7 +18,7 @@
         </el-radio>
       </el-radio-group>
     </el-form-item>
-    <el-form-item v-if="getConfig('deliveryAutoStartPurchaseConfig')">
+    <el-form-item v-if="getConfig('deliveryAutoStartPurchaseConfig') && props.appType == 2">
       <template #label>
         <Tooltip
           v-if="getConfig('deliveryAutoStartPurchaseConfig').remark"
@@ -66,6 +66,13 @@ import * as ConfigApi from '@/api/system/set'
 
 const message = useMessage()
 
+const props = defineProps({
+  appType: {
+    type: Number,
+    default: 1
+  }
+})
+
 const form = ref({})
 
 const configList = ref([])
diff --git a/src/views/Clue/Set/index.vue b/src/views/Clue/Set/index.vue
index c3d1153..b04e75c 100644
--- a/src/views/Clue/Set/index.vue
+++ b/src/views/Clue/Set/index.vue
@@ -34,7 +34,7 @@
         <OtherPayType v-if="tabIndex == 37" />
       </el-tab-pane>
       <el-tab-pane label="常规设置" :name="40" v-if="checkPermi(['clue:setting:general-setting'])">
-        <GeneralSet v-if="tabIndex == 40" />
+        <GeneralSet v-if="tabIndex == 40" :appType="appStore.getAppInfo?.instanceType" />
       </el-tab-pane>
       <!-- <el-tab-pane label="消息通知" :name="50" v-if="checkPermi(['mall:setting:prod'])">
         <MsgSend v-if="tabIndex == 50" />
@@ -56,6 +56,10 @@ import OtherPayType from './Comp/OtherPayType.vue'
 import GeneralSet from './Comp/GeneralSet.vue'
 import { checkPermi } from '@/utils/permission'
 
+import { useAppStore } from '@/store/modules/app'
+
+const appStore = useAppStore()
+
 const tabIndex = ref(0)
 </script>
 
diff --git a/src/views/SchoolManagement/Place/index.vue b/src/views/SchoolManagement/Place/index.vue
index f09c2d9..660cb57 100644
--- a/src/views/SchoolManagement/Place/index.vue
+++ b/src/views/SchoolManagement/Place/index.vue
@@ -190,8 +190,10 @@
         <el-table-column label="启用" width="100">
           <template #default="scope">
             <el-switch
-              v-model="scope.row.showInMap"
-              :disabled="checkPermi(['school:place:update'])"
+              v-model="scope.row.status"
+              :active-value="0"
+              :inactive-value="1"
+              :disabled="!checkPermi(['school:place:update'])"
               @change="changePlaceStatus(scope.row)"
             />
           </template>
@@ -531,11 +533,21 @@ function closePlaceList() {
   fullScreenPlaceList.value = false
 }
 
-async function changePlaceStatus() {
-  // const resp = await updatePlace(item);
-  //     if (resp.code == 200) {
-  resetMarkers()
-  // }
+async function changePlaceStatus(row) {
+  try {
+    // 修改状态的二次确认
+    const text = row.status == 0 ? '启用' : '停用'
+    await message.confirm('确认要"' + text + '""' + row.name + '"场地吗?')
+    // 发起修改状态
+    await PlaceApi.updatePlaceStatus({ placeId: row.placeId, status: row.status })
+    message.success('修改成功')
+    // 刷新列表
+    // await getList()
+    resetMarkers()
+  } catch {
+    // 取消后，进行恢复按钮
+    row.status = row.status == 0 ? 1 : 0
+  }
 }
 
 // const isRanging = ref(false)