From 28904ed0c1c0617ab4eae944ba960b4e509bbe4d Mon Sep 17 00:00:00 2001
From: SjS <email@example.com>
Date: Sat, 26 Apr 2025 16:08:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=96=B0=E5=A2=9E=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bst/ad/index.vue    | 21 +++++++++------------
 src/views/bst/order/index.vue |  4 ++--
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/views/bst/ad/index.vue b/src/views/bst/ad/index.vue
index 6b3ca27..051eacd 100644
--- a/src/views/bst/ad/index.vue
+++ b/src/views/bst/ad/index.vue
@@ -167,15 +167,6 @@
       <!-- 添加或修改广告对话框 -->
       <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
         <el-form ref="form" :rules="rules" :model="form" label-width="80px" v-loading="detailLoading">
-          <el-form-item label="运营区" prop="areaId" >
-              <area-remote-select
-                v-model="form.areaId"
-                :init-options="initAreaOptions"
-                v-if="!detailLoading"
-                placeholder="请选择运营区"
-                style="width: 58%"
-              />
-          </el-form-item>
           <el-form-item label="广告所属" prop="belong" v-if="isSysAdmin()">
             <el-select v-model="form.belong" placeholder="请选择广告所属">
               <el-option
@@ -186,6 +177,15 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="运营区" prop="areaId" v-if="form.belong !== '0'">
+              <area-remote-select
+                v-model="form.areaId"
+                :init-options="initAreaOptions"
+                v-if="!detailLoading"
+                placeholder="请选择运营区"
+                style="width: 58%"
+              />
+          </el-form-item>
           <el-form-item label="广告图片" prop="picture">
             <div class="upload-wrapper">
             <image-upload v-model="form.picture" :limit="1"/>
@@ -257,9 +257,6 @@
           //{key: 'urlType', visible: true, label: '跳转类型，1外链跳转，2站内跳转', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         ],
         rules: {
-          areaId: [
-            { required: true, message: '运营区不能为空', trigger: 'change' }
-          ],
           picture: [
             { required: true, message: '广告图片不能为空', trigger: 'change' }
           ],
diff --git a/src/views/bst/order/index.vue b/src/views/bst/order/index.vue
index 8936dd8..3e96f5e 100644
--- a/src/views/bst/order/index.vue
+++ b/src/views/bst/order/index.vue
@@ -148,7 +148,7 @@
             </template>
             <template v-else-if="column.key === 'suitName'">
               {{d.row.suitName | dv}}<br/>
-              <dict-tag :options="dict.type.suit_type" :value="d.row.suitType" size="mini"/>
+              <dictd-tag :options="dict.type.suit_type" :value="d.row.suitType" size="mini"/>
               <dict-tag :options="dict.type.order_status" :value="d.row.status" size="mini" style="margin-left: 4px;"/>
               <dict-tag :options="dict.type.suit_riding_rule" :value="d.row.suitRidingRule" size="mini" style="margin-left: 4px;"/>
             </template>
@@ -381,7 +381,7 @@ export default {
     handleView(row) {
       this.$router.push(`/view/order/${row.id}`)
     },
-    handleEnd(row) {  
+    handleEnd(row) {
       this.$confirm(`确定结束订单${row.no}吗？`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',