sc
This commit is contained in:
@@ -54,6 +54,7 @@
|
|||||||
"echarts-wordcloud": "^2.1.0",
|
"echarts-wordcloud": "^2.1.0",
|
||||||
"element-plus": "2.9.4",
|
"element-plus": "2.9.4",
|
||||||
"fast-xml-parser": "^4.2.2",
|
"fast-xml-parser": "^4.2.2",
|
||||||
|
"file-saver": "^2.0.5",
|
||||||
"highlight.js": "^11.8.0",
|
"highlight.js": "^11.8.0",
|
||||||
"intro.js": "^7.0.1",
|
"intro.js": "^7.0.1",
|
||||||
"jsencrypt": "^3.3.2",
|
"jsencrypt": "^3.3.2",
|
||||||
@@ -66,7 +67,7 @@
|
|||||||
"qs": "^6.11.2",
|
"qs": "^6.11.2",
|
||||||
"steady-xml": "^0.1.0",
|
"steady-xml": "^0.1.0",
|
||||||
"url": "^0.11.0",
|
"url": "^0.11.0",
|
||||||
"video.js": "^8.3.0",
|
"video.js": "^7.0.0",
|
||||||
"vue": "3.3.4",
|
"vue": "3.3.4",
|
||||||
"vue-amap": "^0.5.10",
|
"vue-amap": "^0.5.10",
|
||||||
"vue-dompurify-html": "^5.0.1",
|
"vue-dompurify-html": "^5.0.1",
|
||||||
@@ -78,6 +79,7 @@
|
|||||||
"vuedraggable": "^4.1.0",
|
"vuedraggable": "^4.1.0",
|
||||||
"web-storage-cache": "^1.1.1",
|
"web-storage-cache": "^1.1.1",
|
||||||
"xe-utils": "^3.5.7",
|
"xe-utils": "^3.5.7",
|
||||||
|
"xlsx": "^0.18.5",
|
||||||
"xml-js": "^1.6.11"
|
"xml-js": "^1.6.11"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
@@ -113,7 +115,7 @@
|
|||||||
"prettier": "^2.8.8",
|
"prettier": "^2.8.8",
|
||||||
"rimraf": "^5.0.1",
|
"rimraf": "^5.0.1",
|
||||||
"rollup": "^3.22.0",
|
"rollup": "^3.22.0",
|
||||||
"sass": "^1.62.1",
|
"sass": "1.75.0",
|
||||||
"stylelint": "^15.6.2",
|
"stylelint": "^15.6.2",
|
||||||
"stylelint-config-html": "^1.1.0",
|
"stylelint-config-html": "^1.1.0",
|
||||||
"stylelint-config-recommended": "^12.0.0",
|
"stylelint-config-recommended": "^12.0.0",
|
||||||
|
|||||||
@@ -44,8 +44,8 @@
|
|||||||
<el-col :span="12" :offset="0">
|
<el-col :span="12" :offset="0">
|
||||||
<el-form-item label="生产状态" prop="isProduced">
|
<el-form-item label="生产状态" prop="isProduced">
|
||||||
<el-radio-group v-model="form.isProduced">
|
<el-radio-group v-model="form.isProduced">
|
||||||
<el-radio :label="0">待生产</el-radio>
|
<el-radio :label="0" :value="0">待生产</el-radio>
|
||||||
<el-radio :label="1">已生产</el-radio>
|
<el-radio :label="1" :value="1">已生产</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|||||||
@@ -48,8 +48,8 @@
|
|||||||
<el-col :span="24" :offset="0" v-if="appStore.getAppInfo?.instanceType == 2">
|
<el-col :span="24" :offset="0" v-if="appStore.getAppInfo?.instanceType == 2">
|
||||||
<el-form-item label="是否退货" prop="isReturns">
|
<el-form-item label="是否退货" prop="isReturns">
|
||||||
<el-radio-group v-model="form.isReturns">
|
<el-radio-group v-model="form.isReturns">
|
||||||
<el-radio :label="true"> 退货 </el-radio>
|
<el-radio :label="true" :value="true"> 退货 </el-radio>
|
||||||
<el-radio :label="false"> 不退货 </el-radio>
|
<el-radio :label="false" :value="false"> 不退货 </el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|||||||
@@ -12,8 +12,8 @@
|
|||||||
<el-col :span="12" :offset="0">
|
<el-col :span="12" :offset="0">
|
||||||
<el-form-item label="状态" prop="state">
|
<el-form-item label="状态" prop="state">
|
||||||
<el-radio-group v-model="formData.state">
|
<el-radio-group v-model="formData.state">
|
||||||
<el-radio :label="3"> 通过 </el-radio>
|
<el-radio :label="3" :value="3"> 通过 </el-radio>
|
||||||
<el-radio :label="4"> 驳回 </el-radio>
|
<el-radio :label="4" :value="4"> 驳回 </el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|||||||
@@ -11,8 +11,8 @@
|
|||||||
<el-col :span="12" :offset="0">
|
<el-col :span="12" :offset="0">
|
||||||
<el-form-item label="状态" prop="state">
|
<el-form-item label="状态" prop="state">
|
||||||
<el-radio-group v-model="formData.state">
|
<el-radio-group v-model="formData.state">
|
||||||
<el-radio :label="3"> 通过 </el-radio>
|
<el-radio :label="3" :value="3"> 通过 </el-radio>
|
||||||
<el-radio :label="4"> 驳回 </el-radio>
|
<el-radio :label="4" :value="4"> 驳回 </el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|||||||
@@ -10,13 +10,13 @@
|
|||||||
<el-col :span="16" :offset="0">
|
<el-col :span="16" :offset="0">
|
||||||
<el-form-item label="发货方式">
|
<el-form-item label="发货方式">
|
||||||
<el-radio-group v-model="form.sendType" :disabled="autoAuditPurchase == 'false'">
|
<el-radio-group v-model="form.sendType" :disabled="autoAuditPurchase == 'false'">
|
||||||
<el-radio :label="1">
|
<el-radio :label="1" :value="1">
|
||||||
<Tooltip
|
<Tooltip
|
||||||
message="必须在进销存的“通用配置-常规配置”中,将 ’采购申请自动通过‘ 设置为“是”"
|
message="必须在进销存的“通用配置-常规配置”中,将 ’采购申请自动通过‘ 设置为“是”"
|
||||||
/>
|
/>
|
||||||
立即采购发货
|
立即采购发货
|
||||||
</el-radio>
|
</el-radio>
|
||||||
<el-radio :label="2"> 使用库存发货 </el-radio>
|
<el-radio :label="2" :value="2"> 使用库存发货 </el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|||||||
@@ -18,8 +18,8 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="是否结清" prop="isPayoff">
|
<el-form-item label="是否结清" prop="isPayoff">
|
||||||
<el-radio-group v-model="form.isPayoff">
|
<el-radio-group v-model="form.isPayoff">
|
||||||
<el-radio :label="true"> 结清 </el-radio>
|
<el-radio :label="true" :value="true"> 结清 </el-radio>
|
||||||
<el-radio :label="false"> 未结清 </el-radio>
|
<el-radio :label="false" :value="false"> 未结清 </el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="备注">
|
<el-form-item label="备注">
|
||||||
|
|||||||
@@ -17,8 +17,8 @@
|
|||||||
<el-col :span="12" :offset="0">
|
<el-col :span="12" :offset="0">
|
||||||
<el-form-item label="状态" prop="state">
|
<el-form-item label="状态" prop="state">
|
||||||
<el-radio-group v-model="formData.state">
|
<el-radio-group v-model="formData.state">
|
||||||
<el-radio :label="3"> 通过 </el-radio>
|
<el-radio :label="3" :value="3"> 通过 </el-radio>
|
||||||
<el-radio :label="4"> 驳回 </el-radio>
|
<el-radio :label="4" :value="4"> 驳回 </el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|||||||
@@ -215,8 +215,14 @@ async function getTableList() {
|
|||||||
...queryParams,
|
...queryParams,
|
||||||
...searchForm.value,
|
...searchForm.value,
|
||||||
pageNo: tableObject.value.pageNo,
|
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))
|
const data = await SignApi.getSignPage(removeNullField(params))
|
||||||
tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.orderDiyParams }))
|
tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.orderDiyParams }))
|
||||||
tableObject.value.total = data.total
|
tableObject.value.total = data.total
|
||||||
@@ -226,10 +232,12 @@ async function getTableList() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const loading = ref(true)
|
const loading = ref(true)
|
||||||
|
const searchFieldList = ref([])
|
||||||
async function getCurdSchemas() {
|
async function getCurdSchemas() {
|
||||||
loading.value = true
|
loading.value = true
|
||||||
try {
|
try {
|
||||||
const data = await getSimpleFieldList()
|
const data = await getSimpleFieldList()
|
||||||
|
searchFieldList.value = data.filter((it) => it.isCustom && it.isSearch)
|
||||||
// const mainOrderFields = data.filter((it) => it.paramLevel == 1)
|
// const mainOrderFields = data.filter((it) => it.paramLevel == 1)
|
||||||
data.forEach((elem) => {
|
data.forEach((elem) => {
|
||||||
if (elem.isSearch) {
|
if (elem.isSearch) {
|
||||||
@@ -299,7 +307,7 @@ async function getOptions() {
|
|||||||
|
|
||||||
const batchIds = ref([])
|
const batchIds = ref([])
|
||||||
function handleSelectionChange(val) {
|
function handleSelectionChange(val) {
|
||||||
batchIds.value = val.map((it) => it.signId)
|
batchIds.value = val.map((it) => it.signOrderId)
|
||||||
}
|
}
|
||||||
|
|
||||||
const selectedValue = ref(undefined)
|
const selectedValue = ref(undefined)
|
||||||
|
|||||||
@@ -127,8 +127,8 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-radio-group v-model="searchForm.settlementState">
|
<el-radio-group v-model="searchForm.settlementState">
|
||||||
<el-radio :label="1"> 已结算 </el-radio>
|
<el-radio :label="1" :value="1"> 已结算 </el-radio>
|
||||||
<el-radio :label="0"> 待结算 </el-radio>
|
<el-radio :label="0" :value="0"> 待结算 </el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
|
|||||||
@@ -249,7 +249,8 @@ async function getTableList() {
|
|||||||
...queryParams,
|
...queryParams,
|
||||||
...searchForm.value,
|
...searchForm.value,
|
||||||
pageNo: tableObject.value.pageNo,
|
pageNo: tableObject.value.pageNo,
|
||||||
pageSize: tableObject.value.pageSize
|
pageSize: tableObject.value.pageSize,
|
||||||
|
diyParams: {}
|
||||||
}
|
}
|
||||||
searchFieldList.value.map((it) => {
|
searchFieldList.value.map((it) => {
|
||||||
if (params[it.field]) {
|
if (params[it.field]) {
|
||||||
@@ -270,7 +271,7 @@ async function getCurdSchemas() {
|
|||||||
loading.value = true
|
loading.value = true
|
||||||
try {
|
try {
|
||||||
const data = await getSimpleFieldList()
|
const data = await getSimpleFieldList()
|
||||||
searchFieldList.value = data.filter((it) => it.isCustom)
|
searchFieldList.value = data.filter((it) => it.isCustom && it.isSearch)
|
||||||
data.forEach((elem) => {
|
data.forEach((elem) => {
|
||||||
if (['createUser'].includes(elem.field)) {
|
if (['createUser'].includes(elem.field)) {
|
||||||
elem.search.options = userOptions.value
|
elem.search.options = userOptions.value
|
||||||
|
|||||||
@@ -126,8 +126,8 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-radio-group v-model="searchForm.settlementState">
|
<el-radio-group v-model="searchForm.settlementState">
|
||||||
<el-radio :label="1"> 已结算 </el-radio>
|
<el-radio :label="1" :value="1"> 已结算 </el-radio>
|
||||||
<el-radio :label="0"> 待结算 </el-radio>
|
<el-radio :label="0" :value="0"> 待结算 </el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
|
|||||||
@@ -238,7 +238,7 @@ async function getCurdSchemas() {
|
|||||||
loading.value = true
|
loading.value = true
|
||||||
try {
|
try {
|
||||||
const data = await getSimpleFieldList()
|
const data = await getSimpleFieldList()
|
||||||
searchFieldList.value = data.filter((it) => it.isCustom)
|
searchFieldList.value = data.filter((it) => it.isCustom && it.isSearch)
|
||||||
data.forEach((elem) => {
|
data.forEach((elem) => {
|
||||||
if (['followUser', 'convertPeople'].includes(elem.field)) {
|
if (['followUser', 'convertPeople'].includes(elem.field)) {
|
||||||
elem.search.options = userOptions.value
|
elem.search.options = userOptions.value
|
||||||
|
|||||||
Reference in New Issue
Block a user