This commit is contained in:
2025-08-30 17:05:48 +08:00
parent 21737cde3c
commit 518d64bca4
14 changed files with 6106 additions and 6043 deletions

View File

@@ -44,8 +44,8 @@
<el-col :span="12" :offset="0">
<el-form-item label="生产状态" prop="isProduced">
<el-radio-group v-model="form.isProduced">
<el-radio :label="0">待生产</el-radio>
<el-radio :label="1">已生产</el-radio>
<el-radio :label="0" :value="0">待生产</el-radio>
<el-radio :label="1" :value="1">已生产</el-radio>
</el-radio-group>
</el-form-item>
</el-col>

View File

@@ -48,8 +48,8 @@
<el-col :span="24" :offset="0" v-if="appStore.getAppInfo?.instanceType == 2">
<el-form-item label="是否退货" prop="isReturns">
<el-radio-group v-model="form.isReturns">
<el-radio :label="true"> 退货 </el-radio>
<el-radio :label="false"> 不退货 </el-radio>
<el-radio :label="true" :value="true"> 退货 </el-radio>
<el-radio :label="false" :value="false"> 不退货 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>

View File

@@ -12,8 +12,8 @@
<el-col :span="12" :offset="0">
<el-form-item label="状态" prop="state">
<el-radio-group v-model="formData.state">
<el-radio :label="3"> 通过 </el-radio>
<el-radio :label="4"> 驳回 </el-radio>
<el-radio :label="3" :value="3"> 通过 </el-radio>
<el-radio :label="4" :value="4"> 驳回 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>

View File

@@ -11,8 +11,8 @@
<el-col :span="12" :offset="0">
<el-form-item label="状态" prop="state">
<el-radio-group v-model="formData.state">
<el-radio :label="3"> 通过 </el-radio>
<el-radio :label="4"> 驳回 </el-radio>
<el-radio :label="3" :value="3"> 通过 </el-radio>
<el-radio :label="4" :value="4"> 驳回 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>

View File

@@ -10,13 +10,13 @@
<el-col :span="16" :offset="0">
<el-form-item label="发货方式">
<el-radio-group v-model="form.sendType" :disabled="autoAuditPurchase == 'false'">
<el-radio :label="1">
<el-radio :label="1" :value="1">
<Tooltip
message="必须在进销存的“通用配置-常规配置”中,将 ’采购申请自动通过‘ 设置为“是”"
/>
立即采购发货
</el-radio>
<el-radio :label="2"> 使用库存发货 </el-radio>
<el-radio :label="2" :value="2"> 使用库存发货 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>

View File

@@ -18,8 +18,8 @@
</el-form-item>
<el-form-item label="是否结清" prop="isPayoff">
<el-radio-group v-model="form.isPayoff">
<el-radio :label="true"> 结清 </el-radio>
<el-radio :label="false"> 未结清 </el-radio>
<el-radio :label="true" :value="true"> 结清 </el-radio>
<el-radio :label="false" :value="false"> 未结清 </el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注">

View File

@@ -17,8 +17,8 @@
<el-col :span="12" :offset="0">
<el-form-item label="状态" prop="state">
<el-radio-group v-model="formData.state">
<el-radio :label="3"> 通过 </el-radio>
<el-radio :label="4"> 驳回 </el-radio>
<el-radio :label="3" :value="3"> 通过 </el-radio>
<el-radio :label="4" :value="4"> 驳回 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>

View File

@@ -215,8 +215,14 @@ async function getTableList() {
...queryParams,
...searchForm.value,
pageNo: tableObject.value.pageNo,
pageSize: tableObject.value.pageSize
pageSize: tableObject.value.pageSize,
diyParams: {}
}
searchFieldList.value.map((it) => {
if (params[it.field]) {
params.diyParams[it.field] = params[it.field]
}
})
const data = await SignApi.getSignPage(removeNullField(params))
tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.orderDiyParams }))
tableObject.value.total = data.total
@@ -226,10 +232,12 @@ async function getTableList() {
}
const loading = ref(true)
const searchFieldList = ref([])
async function getCurdSchemas() {
loading.value = true
try {
const data = await getSimpleFieldList()
searchFieldList.value = data.filter((it) => it.isCustom && it.isSearch)
// const mainOrderFields = data.filter((it) => it.paramLevel == 1)
data.forEach((elem) => {
if (elem.isSearch) {
@@ -299,7 +307,7 @@ async function getOptions() {
const batchIds = ref([])
function handleSelectionChange(val) {
batchIds.value = val.map((it) => it.signId)
batchIds.value = val.map((it) => it.signOrderId)
}
const selectedValue = ref(undefined)

View File

@@ -127,8 +127,8 @@
</el-form-item>
<el-form-item>
<el-radio-group v-model="searchForm.settlementState">
<el-radio :label="1"> 已结算 </el-radio>
<el-radio :label="0"> 待结算 </el-radio>
<el-radio :label="1" :value="1"> 已结算 </el-radio>
<el-radio :label="0" :value="0"> 待结算 </el-radio>
</el-radio-group>
</el-form-item>

View File

@@ -249,7 +249,8 @@ async function getTableList() {
...queryParams,
...searchForm.value,
pageNo: tableObject.value.pageNo,
pageSize: tableObject.value.pageSize
pageSize: tableObject.value.pageSize,
diyParams: {}
}
searchFieldList.value.map((it) => {
if (params[it.field]) {
@@ -270,7 +271,7 @@ async function getCurdSchemas() {
loading.value = true
try {
const data = await getSimpleFieldList()
searchFieldList.value = data.filter((it) => it.isCustom)
searchFieldList.value = data.filter((it) => it.isCustom && it.isSearch)
data.forEach((elem) => {
if (['createUser'].includes(elem.field)) {
elem.search.options = userOptions.value

View File

@@ -126,8 +126,8 @@
</el-form-item>
<el-form-item>
<el-radio-group v-model="searchForm.settlementState">
<el-radio :label="1"> 已结算 </el-radio>
<el-radio :label="0"> 待结算 </el-radio>
<el-radio :label="1" :value="1"> 已结算 </el-radio>
<el-radio :label="0" :value="0"> 待结算 </el-radio>
</el-radio-group>
</el-form-item>
<el-form-item>

View File

@@ -238,7 +238,7 @@ async function getCurdSchemas() {
loading.value = true
try {
const data = await getSimpleFieldList()
searchFieldList.value = data.filter((it) => it.isCustom)
searchFieldList.value = data.filter((it) => it.isCustom && it.isSearch)
data.forEach((elem) => {
if (['followUser', 'convertPeople'].includes(elem.field)) {
elem.search.options = userOptions.value