Merge branch 'intex_online20250327' into intex

src/views/home/index.vue

@@ -4,7 +4,14 @@
     <material  v-hasRole="['super_admin']"/>
     <product  v-hasRole="['super_admin']"/>
     <produce  v-hasRole="['super_admin']"/> -->
-    <supplierIndex />
+    
+    <ContentWrap v-clientTable v-if="showText">
+      <div class="logo" v-clientTable>
+        <img src="../../assets/imgs/logo_white.png" alt="">
+        <span>欢迎使用供应商系统!</span>
+      </div>
+    </ContentWrap>
+    <supplierIndex v-else />
     <!-- <material/> -->
     <!-- 和 material 中四个table重复了，先去掉了 -->
     <!-- <product/> --> 
@@ -12,8 +19,55 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import supplierIndex from './components/supplierIndex.vue'
-  import material from './components/material.vue'
-  import product from './components/product.vue'
-  import produce from './components/produce.vue'
+import { getBaseUrl } from '@/utils/systemParam'
+import supplierIndex from './components/supplierIndex.vue'
+import material from './components/material.vue'
+import product from './components/product.vue'
+import produce from './components/produce.vue'
+  
+const origin = ref(window.location.origin)
+const mode = ref(import.meta.env.MODE)
+console.log(11,mode.value)
+console.log(22,window.location)
+const showText = ref(false)
+// 生产环境取域名
+if (mode.value === 'prod') { 
+  if (origin.value == 'https://tjintex-scp.toyota-boshoku-china.com') {
+    showText.value = true
+  } else {
+    showText.value = false
+  }
+  // 测试取域名
+} else if (mode.value === 'test') { 
+  if (origin.value == 'http://dev.ccwin-in.com:28040') {
+    showText.value = true
+  } else {
+    showText.value = false
+  }
+} else {
+  // 本地环境取env文件
+  if (import.meta.env.VITE_BASE_URL == 'http://dev.ccwin-in.com:28040/api') {
+    showText.value = true
+  } else {
+    showText.value = false
+  }
+}
 </script>
+<style lang="scss" scoped>
+.logo{
+  display: flex;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  justify-content: center;
+ img{
+  width: 20vw;
+  height: auto !important;;
+ }
+ span{
+  font-size: 6vmin;
+  font-weight: bold;
+  padding-left: 2vw;
+ }
+}
+</style>

src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts

@@ -5,7 +5,10 @@ import {
 } from '../moldAllocation/customerStatement/customerStatementMain.data'
 import * as CustomerStatementMainApi from '@/api/wms/customerStatementMain'
 import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
 const { t } = useI18n() // 国际化
+const invoiceType = [{label:'全部',value:''},...getDictOptions(DICT_TYPE.INVOICE_TYPE)]
+console.log(888, invoiceType)
 
 let custormList = []
 try {
@@ -255,31 +258,22 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '开票种类',
     field: 'invoiceType',
-    dictType: DICT_TYPE.INVOICE_TYPE,
+    // dictType: DICT_TYPE.INVOICE_TYPE,
     dictClass: 'string',
     table: {
       width: 150
     },
-    // form: {
-    //   component: 'Select',
-    //   value:[''],
-    //   componentProps: {
-    //     showAll: true,// 备用做全选
-    //     multiple: true,
-    //     // emptyValues:[null, undefined],
-    //     valueOnClear: null,
-    //     options: [{
-    //       label: '全部',
-    //       value: ''
-    //     }, {
-    //       label: '号口品',
-    //       value: '号口品'
-    //     }, {
-    //       label: '补给品',
-    //       value: '补给品'
-    //     }]
-    //   }
-    // },
+    form: {
+      component: 'Select',
+      value:[''],
+      componentProps: {
+        // showAll: true,// 备用做全选
+        multiple: true,
+        // emptyValues:[null, undefined],
+        valueOnClear: null,
+        options: invoiceType
+      }
+    },
   },
   {
     label: '创建时间',
@@ -455,7 +449,8 @@ form:{
       width: 150
     },
     tableForm: {
-      disabled:true
+      disabled: true,
+      type:'Select',
     }
   },
   {

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@@ -461,7 +461,7 @@ const submitForm = async (formType, submitData) => {
     return
   }
   
-  let findInventoryStatus = tableData.value.find(item=>item.fromBatch&&item.toBatch)
+  let findInventoryStatus = tableData.value.find(item=>item.fromInventoryStatus&&item.toInventoryStatus&&item.fromInventoryStatus==item.toInventoryStatus&&item.fromQty&&item.toQty&&item.fromQty==item.toQty&&item.fromExpireDate&&item.toExpireDate&&item.fromExpireDate==item.toExpireDate&&item.originFrozen==item.frozen&&item.fromBatch==item.toBatch)
   if(findInventoryStatus){
     message.warning('您未修改数据')
     return