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

9/14 优化界面

Browse Source
20240912_adapter_z
wangwei 7 months ago
parent 2734993366
commit bd17652e35
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-input-number>
</el-form-item> </el-form-item>
</el-col> </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-row>
<el-divider></el-divider> <el-divider></el-divider>

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

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

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

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

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

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

Write Preview
Loading…
Cancel
Save