Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into hella_online_20240803

src/views/login/components/LoginForm.vue

@@ -33,7 +33,7 @@
             :prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" style="height: 42px;" />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px" v-if="needCode!='false'">
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px" v-if="needCode">
         <el-form-item prop="code">
           <div class="flex w-[100%]">
             <el-input v-model="loginData.loginForm.code" :placeholder="t('login.codePlaceholder')"
@@ -97,7 +97,7 @@
   import * as DeptApi from '@/api/system/dept'
   import { getTenant } from '@/utils/systemParam'
   import { getSystermUpdateAlert,getSystermUpdateUrl,getNeedCode } from '@/utils/systemParam'
-  const needCode = ref(getNeedCode())
+  const needCode = ref(getNeedCode()==true||getNeedCode()=='true')
 
   defineOptions({ name: 'LoginForm' })
 
@@ -174,7 +174,7 @@
   //   }
   // }
   function getCode() {
-    if(needCode.value=='false'){
+    if(!needCode.value){
       return
     }
     getCodeImg().then(res => {
@@ -234,7 +234,7 @@
         return
       }
       let res = null
-      if(needCode.value=='false'){
+      if(!needCode.value){
         res = await LoginApi.loginNoCode(loginData.loginForm)
       }else{
         res = await LoginApi.login(loginData.loginForm)

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts

@@ -935,6 +935,34 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       disabled:false
     }
   },
+  {
+    label: '退货原因',
+    field: 'reasonType',
+    dictType: DICT_TYPE.RETURN_REASON_TYPE,
+    dictClass: 'string',
+    // isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type: 'Select',
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '退货原因描述',
+    field: 'reason',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '计量单位',
     field: 'uom',

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts

@@ -744,20 +744,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     hiddenInMain: true,
     isSearch: false
   },
-  {
-    label: '原因',
-    field: 'reason',
-    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault: 1013,
-    hiddenInMain: true
-  },
-
+  
   {
     label: '物料代码',
     field: 'itemCode',
@@ -887,7 +874,35 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   //   },
   // },
   {
-    label: '原因',
+    label: '退货原因',
+    field: 'reasonType',
+    dictType: DICT_TYPE.RETURN_REASON_TYPE,
+    dictClass: 'string',
+    // isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type: 'Select',
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '退货原因描述',
+    field: 'reason',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
     field: 'remark',
     sort: 'custom',
     table: {

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts

@@ -1236,6 +1236,34 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       precision: 6
     }
   },
+  {
+    label: '退货原因',
+    field: 'reasonType',
+    dictType: DICT_TYPE.RETURN_REASON_TYPE,
+    dictClass: 'string',
+    // isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type: 'Select',
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '退货原因描述',
+    field: 'reason',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '库存状态',
     field: 'inventoryStatus',

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@@ -702,16 +702,16 @@ const buttonTableClick = async (val, row) => {
     handleRepeal(row.id)
   }
 }
-const procurementCreators = ref([])
-SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({
-  roleCode: 'purchase',
-  pageSize: 1000,
-  pageNo: 1,
-  sort: '',
-  by: 'ASC'
-}).then((res) => {
-procurementCreators.value = res.list
-})
+// const procurementCreators = ref([])
+// SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({
+//   roleCode: 'purchase',
+//   pageSize: 1000,
+//   pageNo: 1,
+//   sort: '',
+//   by: 'ASC'
+// }).then((res) => {
+// procurementCreators.value = res.list
+// })
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = async (type: string, row?: any) => {
@@ -787,10 +787,10 @@ const openForm = async (type: string, row?: any) => {
         item.componentProps.disabled = false
       }
 
-      if (item.field == 'procurementCreator') {
-        item.componentProps.options = procurementCreators.value
+      // if (item.field == 'procurementCreator') {
+      //   item.componentProps.options = procurementCreators.value
         
-      }
+      // }
     })
   }
   if (row && (row.status == '3' || row.status == '7')) {
@@ -813,13 +813,13 @@ const openForm = async (type: string, row?: any) => {
     }
     tableData.value = [] // 重置明细数据
     formRef.value.open(type, row)
-    if(type=='create'){
-      nextTick(() => {
-      formRef.value.formRef.setValues({
-          procurementCreator:procurementCreators.value[0].id
-          })
-      })
-    }
+    // if(type=='create'){
+    //   nextTick(() => {
+    //   formRef.value.formRef.setValues({
+    //       procurementCreator:procurementCreators.value[0].id
+    //       })
+    //   })
+    // }
   })
 }
 const defaultSupplierCode = ref('')