Browse Source

代码上传

zhangqi 1 năm trước cách đây
mục cha
commit
6830e6519e

+ 6 - 1
src/DRP/HDrpManagement/orderMxList/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <listTemp ref="list" :param="param" :tableName="'orderMxTable'" keyRouteName="sonum" :detailPage="{name:'orderdetail',idname:'sa_orderid'}" :searchType="searchType">
+    <listTemp ref="list" :param="param" :tableName="'orderMxTable'" keyRouteName="sonum" :detailPage="{name:siteInfo.siteid == 'CUCU'?'':'orderDetail_cucu',idname:'sa_orderid'}" :searchType="searchType">
       <template #operation>
         订单明细
       </template>
@@ -29,7 +29,12 @@
   import { ref } from 'vue'
   import { useRouter } from "vue-router";
   import { onMounted } from "vue";
+  import { storeToRefs } from 'pinia'
+  import { useBaseStore } from '@/stores/modules/base'
+  const base = useBaseStore()
+  let { siteInfo } = storeToRefs(base)
   const router = useRouter()
+  
   const list = ref()
   let columns = ref([])
   let dataSource = ref([])

+ 1 - 1
src/customized/cucu/orderManage/detail/index.vue

@@ -36,7 +36,7 @@
           <a-button v-if="utils.hasPermission('unExamine')" type="primary" :disabled="utils.isDisabled(orderData.status,[''],(orderData.status !=='审核'))" @click="checkBill(20230102141502,'反审核')">反审核</a-button>
           <a-button v-if="utils.hasPermission('cancel')" type="primary" :disabled="utils.isDisabled(orderData.status,[''],(orderData.status !== '审核'))" @click="checkBill(20230406155202,'手工关闭')">关闭</a-button>
           <a-button v-if="utils.hasPermission('copy')" type="primary" :disabled="utils.isDisabled(orderData.status,[''],(orderData.type === '促销订单'))">
-            <selectEnterprise :disabled="utils.isDisabled(orderData.status,[''],(orderData.type === '促销订单'))" :param="{id:20230219195002,content:{ismanage :1,pageNumber:1,pageSize:20,where:{condition:''}}}" @onSelect="copyOrder">
+            <selectEnterprise title="选择经销商" :disabled="utils.isDisabled(orderData.status,[''],(orderData.type === '促销订单'))" :param="{id:20230219195002,content:{ismanage :1,pageNumber:1,pageSize:20,where:{condition:''}}}" @onSelect="copyOrder">
               <template #text>复制</template>
             </selectEnterprise>
           </a-button>

+ 1 - 5
src/template/selectEnterprise/index.vue

@@ -7,7 +7,7 @@
         <slot name="text"></slot>
       </a-space>
     </div>
-    <a-modal v-if="!disabled" v-model:open="visible" :title="title" :bodyStyle="{padding:'10px'}" width="900px" :footer="null" :afterClose="handleCancel">
+    <a-modal v-if="!disabled" v-model:open="visible" title="选择" :bodyStyle="{padding:'10px'}" width="900px" :footer="null" :afterClose="handleCancel">
       <a-input class="search-panel" v-model:value="search" placeholder="搜索内容" @keyup.enter="searchData" allowClear></a-input>
       <a-table class="ant-table-striped" :row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)" :scroll="{x:'max-content',y:'500px'}" :dataSource="dataSource" :columns="props.columns || columns" size="small" :pagination="{defaultPageSize:20,total:total}" @change="onChange">
         <template #bodyCell="{ column,record }">
@@ -32,10 +32,6 @@ const props = defineProps({
   columns:Array,
   disabled:Boolean,
   autoComplete:Boolean,
-  title: {
-    type:Number,
-    default:() => '选择经销商'
-  }
 })
 const emit = defineEmits(['onSelect'])
 const visible = ref(false)