UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

Browse Source
yanshishuju
yewj 1 year ago
parent 79ee280132 d1b5dca706
commit f5273d4b38
5 changed files with 149 additions and 136 deletions
Show Stats Download Patch File Download Diff File

9
src/views/basic/workplace/addBusTypeDialog.vue
Unescape Escape View File

@ -91,6 +91,15 @@
></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="业务顺号:" prop="number" class="query-form-item">
<el-input
v-model="formData.number" style="width: 80%"
type="Number"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-divider></el-divider>

9
src/views/basic/workplace/workplaceManage.vue
Unescape Escape View File

@ -352,8 +352,9 @@
:visible.sync="addWorkplaceDialogVisible"
width="60%"
v-if="addWorkplaceDialogVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
:close-on-click-modal="false"
:show-close="false"
>
<el-form :model="formData" style="width: 100%;" ref="dataForm" :rules="formRules"
label-width="auto"
@ -934,6 +935,7 @@ export default {
},
hideForm() {
this.addWorkplaceDialogVisible = false
this.getList()
},
invChange(invCode) {
this.filterQuery.invCode = invCode
@ -982,14 +984,13 @@ export default {
} else {
updateWorkplace(this.formData).then(res => {
if (res.code != 20000) {
return this.$message.error('更新错误')
return this.$message.error(res.message)
}
this.addWorkplaceDialogVisible = false
this.$message.success(res.data)
this.$message.success("更新成功")
this.getList()
}).catch(() => {
this.addWorkplaceDialogVisible = false
this.$message.error('更新错误')
})
}

3
src/views/collect/CollectOrderAllotCardComponents.vue
Unescape Escape View File

@ -516,7 +516,8 @@ export default {
findWorkPlace: [],
getBusType: [],
},
showType: 1
showType: 1,
routerParam:this.$route.query.routerParam
}
},

259
src/views/collect/CollectOrderNew.vue
Unescape Escape View File

@ -10,7 +10,7 @@
:label="item.columnDesc+`:`" :key="item.id">
<el-input
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
:placeholder="item.columnDesc == '搜索' ? '单据号/往来单位/来源系统' : item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable
@ -30,6 +30,7 @@
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
class="query-form-item"
@ -128,8 +129,8 @@
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-tabs type="border-card" style="margin-top: 55px">
<el-tab-pane label="原始单据">
<!--<el-tabs type="border-card" style="margin-top: 55px">-->
<!-- <el-tab-pane label="原始单据">-->
<el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
@row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" ref="multipleTable"
@ -240,121 +241,121 @@
></pagination>
</el-tab-pane>
<el-tab-pane label="异常单据">
<el-table v-loading="loading" :data="errList" style="width: 100%;" border highlight-current-row
@row-click="(row) => executeFuc(row,'0',tableObj1.handleChangeFuc)" ref="multipleTable"
:default-sort="defaultSort"
:row-style="{ height: '32px' }"
@sort-change="handleSortChange">
<template v-for="(item, index) in tableHeader1">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
item.lableRuleObj[scope.row[item.columnName]]
}}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
}}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
scope.row[item.columnName]
}}</span>
</template>
</el-table-column>
</template>
</el-table>
<pagination
v-show="errTotal>0"
:total="errTotal"
:limit.sync="errQuery.limit"
:page.sync="errQuery.page"
@pagination="handleCurrentChange"
></pagination>
</el-tab-pane>
</el-tabs>
<!--</el-tab-pane>-->
<!--<el-tab-pane label="异常单据">-->
<!-- <el-table v-loading="loading" :data="errList" style="width: 100%;" border highlight-current-row-->
<!-- @row-click="(row) => executeFuc(row,'0',tableObj1.handleChangeFuc)" ref="multipleTable"-->
<!-- :default-sort="defaultSort"-->
<!-- :row-style="{ height: '32px' }"-->
<!-- @sort-change="handleSortChange">-->
<!-- <template v-for="(item, index) in tableHeader1">-->
<!-- <el-table-column-->
<!-- v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"-->
<!-- type="index" :label="item.columnDesc"></el-table-column>-->
<!-- <el-table-column-->
<!-- v-if="item.columnType == 'selection'"-->
<!-- type="selection"-->
<!-- :width="item.width"-->
<!-- :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"-->
<!-- :prop="item.columnName"-->
<!-- :label="item.columnDesc"-->
<!-- :sortable="item.sort"-->
<!-- :width="item.width"-->
<!-- :show-overflow-tooltip="item.tooltip"-->
<!-- :key="item.columnName"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"-->
<!-- :prop="item.columnName"-->
<!-- :label="item.columnDesc"-->
<!-- :sortable="item.sort"-->
<!-- :width="item.width"-->
<!-- :show-overflow-tooltip="item.tooltip"-->
<!-- :key="item.columnName"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{-->
<!-- item.lableRuleObj[scope.row[item.columnName]]-->
<!-- }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"-->
<!-- :prop="item.columnName"-->
<!-- :label="item.columnDesc"-->
<!-- :sortable="item.sort"-->
<!-- :width="item.width"-->
<!-- :show-overflow-tooltip="item.tooltip"-->
<!-- :key="item.columnName"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag-->
<!-- :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">-->
<!-- <span>{{-->
<!-- item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]-->
<!-- }}</span>-->
<!-- </el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"-->
<!-- :prop="item.columnName"-->
<!-- :label="item.columnDesc"-->
<!-- :width="item.width"-->
<!-- :key="item.columnName"-->
<!-- fixed="right"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"-->
<!-- :type="buttonItem.type"-->
<!-- :size="buttonItem.size"-->
<!-- :style="buttonItem.style"-->
<!-- :key="buttonItem"-->
<!-- v-if="executeEval(scope.row,buttonItem.hasPermi,true)"-->
<!-- :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"-->
<!-- @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"-->
<!-- >{{ buttonItem.name }}-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"-->
<!-- :prop="item.columnName"-->
<!-- :label="item.columnDesc"-->
<!-- :sortable="item.sort"-->
<!-- :width="item.width"-->
<!-- :show-overflow-tooltip="item.tooltip"-->
<!-- :key="item.columnName"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{-->
<!-- scope.row[item.columnName]-->
<!-- }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </template>-->
<!-- </el-table>-->
<!-- <pagination-->
<!-- v-show="errTotal>0"-->
<!-- :total="errTotal"-->
<!-- :limit.sync="errQuery.limit"-->
<!-- :page.sync="errQuery.page"-->
<!-- @pagination="handleCurrentChange"-->
<!-- ></pagination>-->
<!--</el-tab-pane>-->
<!--</el-tabs>-->
</el-card>
@ -521,7 +522,7 @@ export default {
workplaceCode: '',
page: 1,
limit: 100
}
},
}
},
@ -557,7 +558,7 @@ export default {
},
onReset() {
this.filterQuery = {
tagStatus: this.tagStatus,
tagStatus: String(this.tagStatus),
tagStatusList: this.tagStatusList,
billNo: null,
busType: null,
@ -588,7 +589,7 @@ export default {
// if (this.filterQuery.workPlaceCode == null) {
// return this.$message.error("请先选择工位")
// }
this.downloadPrescriptionVisible = true
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1];
@ -597,13 +598,13 @@ export default {
this.filterQuery.endTime = null;
}
downloadOrder(this.filterQuery).then(res => {
if (res.code == 20000) {
return this.$message.success(res.data)
} else {
return this.$message.error(res.message)
}
})
// downloadOrder(this.filterQuery).then(res => {
// if (res.code == 20000) {
// return this.$message.success(res.data)
// } else {
// return this.$message.error(res.message)
// }
// })
},
clearAllOrder() {
this.loading = true;
@ -856,7 +857,7 @@ export default {
});
this.filterQuery.tagStatus = this.tagStatus
this.filterQuery.tagStatus = String(this.tagStatus)
this.filterQuery.tagStatusList = this.tagStatusList
this.findWorkPlace(this, '')
}

5
src/views/collect/CollectOrderNewParent.vue
Unescape Escape View File

@ -2,7 +2,8 @@
<div>
<CollectOrderNew
:tagStatusList=[0,1,2]
:tagStatusList=[0,1,2,4]
:tagStatus="4"
></CollectOrderNew>
<!-- <el-tabs type="border-card" style="margin: 15px">-->
@ -34,7 +35,7 @@ export default {
name: "PrescribeTagCode",
components: {
CollectOrderNew
}
},
}
</script>

Write Preview
Loading…
Cancel
Save