24282 hace 11 meses
padre
commit
e5b519a70d

+ 3 - 3
jy-ui/src/components/AForm/ADatePicker.vue

@@ -83,7 +83,7 @@ const computedModelValue = computed({
 <template>
   <el-date-picker
     v-model="computedModelValue"
-    :placeholder="disabled ? '' : placeholder"
+    :placeholder="placeholder"
     :clearable="clearable"
     :disabled="disabled"
     :readonly="readonly"
@@ -95,8 +95,8 @@ const computedModelValue = computed({
     :default-time="defaultTime"
     :disabled-date="disabledDate"
     :shortcuts="shortcuts"
-    :start-placeholder="disabled ? '' : startPlaceholder"
-    :end-placeholder="disabled ? '' : endPlaceholder"
+    :start-placeholder="startPlaceholder"
+    :end-placeholder="endPlaceholder"
     :range-separator="rangeSeparator"
     style="width: 100%"
     @change="(value: any) => change?.(value)"

+ 1 - 1
jy-ui/src/components/AForm/AInput.vue

@@ -48,7 +48,7 @@ const computedModelValue = computed({
 <template>
   <el-input
     v-model="computedModelValue"
-    :placeholder="disabled ? '' : placeholder"
+    :placeholder="placeholder"
     :clearable="clearable"
     :disabled="disabled"
     :readonly="readonly"

+ 1 - 1
jy-ui/src/components/AForm/AInputNumber.vue

@@ -38,7 +38,7 @@ const computedModelValue = computed({
 <template>
   <el-input-number
     v-model="computedModelValue"
-    :placeholder="disabled ? '' : placeholder"
+    :placeholder="placeholder"
     :disabled="disabled"
     :readonly="readonly"
     :style="style"

+ 1 - 1
jy-ui/src/components/AForm/ASelect.vue

@@ -85,7 +85,7 @@ function clearOption() {
 <template>
   <el-select
     v-model="computedModelValue"
-    :placeholder="disabled ? '' : placeholder"
+    :placeholder="placeholder"
     :clearable="clearable"
     :disabled="disabled"
     :style="style"

+ 2 - 4
jy-ui/src/components/FlieUpload/index.vue

@@ -40,8 +40,7 @@ watch(
     fileList.value = data
   },
   {
-    immediate: true,
-    once: true
+    immediate: true
   }
 )
 
@@ -89,7 +88,6 @@ const onExceed = () => {
 <template>
   <el-upload
     :file-list="fileList"
-    class="upload-demo"
     :headers="headers"
     :action="action"
     :multiple="!limit || limit > 1"
@@ -103,7 +101,7 @@ const onExceed = () => {
     :style="{ width }"
   >
     <el-button type="primary" :disabled="disabled">上传文件</el-button>
-    <template v-if="tip" #tip>
+    <template v-if="tip && !disabled" #tip>
       <div class="el-upload__tip">
         {{ tip }}
       </div>

+ 21 - 8
jy-ui/src/views/business/payment/requests/flowDetail.vue

@@ -46,12 +46,14 @@ const formConfig: FormConfigType[] = [
       const data = await getCorporationPageApi({ searchAll: true })
       return data.records
     },
+    placeholder: props.disabled ? '' : undefined,
     rule: [{ required: true, message: '归属公司id不能为空', trigger: 'blur' }]
   },
   {
     type: 'slot',
     prop: 'deptId',
     label: '归属部门',
+    placeholder: props.disabled ? '' : undefined,
     rule: [{ required: true, message: '部门id不能为空', trigger: 'blur' }]
   },
   {
@@ -59,6 +61,7 @@ const formConfig: FormConfigType[] = [
     prop: 'type',
     label: '请款类型',
     dict: 'payment_requests_type',
+    placeholder: props.disabled ? '' : undefined,
     rule: [{ required: true, message: '请款类型不能为空', trigger: 'blur' }]
   },
   {
@@ -67,7 +70,8 @@ const formConfig: FormConfigType[] = [
     label: '用款时间',
     datePickerType: 'datetime',
     format: 'YYYY-MM-DD 00:00:00',
-    valueFormat: 'YYYY-MM-DD 00:00:00'
+    valueFormat: 'YYYY-MM-DD 00:00:00',
+    placeholder: props.disabled ? '' : undefined
   },
   {
     type: 'input',
@@ -83,13 +87,15 @@ const formConfig: FormConfigType[] = [
     type: 'slot',
     prop: 'atts',
     label: '上传附件',
-    span: 24
+    span: 24,
+    placeholder: props.disabled ? '' : undefined
   },
   {
     type: 'slot',
     prop: 'detailTable',
     label: '请款明细',
-    span: 24
+    span: 24,
+    placeholder: props.disabled ? '' : undefined
   },
   {
     type: 'input',
@@ -104,6 +110,7 @@ const formConfig: FormConfigType[] = [
     label: '单据数量',
     min: 0,
     precision: 0,
+    placeholder: props.disabled ? '' : undefined,
     rule: [{ required: true, message: '单据数量不能为空', trigger: 'blur' }]
   },
   {
@@ -111,6 +118,7 @@ const formConfig: FormConfigType[] = [
     prop: 'payType',
     label: '付款方式',
     dict: 'pay_type',
+    placeholder: props.disabled ? '' : undefined,
     rule: [{ required: true, message: '付款方式不能为空', trigger: 'blur' }]
   },
   {
@@ -122,27 +130,32 @@ const formConfig: FormConfigType[] = [
     async option() {
       const data = await getCapitalAccountPageApi({ searchAll: true })
       return data.records
-    }
+    },
+    placeholder: props.disabled ? '' : undefined
   },
   {
     type: 'input',
     prop: 'accountName',
-    label: '户名'
+    label: '户名',
+    placeholder: props.disabled ? '' : undefined
   },
   {
     type: 'input',
     prop: 'account',
-    label: '银行账号'
+    label: '银行账号',
+    placeholder: props.disabled ? '' : undefined
   },
   {
     type: 'input',
     prop: 'depositBank',
-    label: '开户银行'
+    label: '开户银行',
+    placeholder: props.disabled ? '' : undefined
   },
   {
     type: 'input',
     prop: 'correspondentNumber',
-    label: '联行号/SWIFT Code'
+    label: '联行号/SWIFT Code',
+    placeholder: props.disabled ? '' : undefined
   }
 ]