zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zcdsj:c33a1e3c80871eb34e9d59768aa2ac3b73da1d56
Branches Tags
zcdsj:master
zcdsj:gzerp
zcdsj:base
zcdsj:scui
zcdsj:2.6.2025040209
zcdsj:2.6.2025031916
...
compare: zcdsj:3da6e028149cbefbb0d7e5a7487b3df41466950a
Branches Tags
zcdsj:master
zcdsj:gzerp
zcdsj:base
zcdsj:scui
zcdsj:2.6.2025040209
zcdsj:2.6.2025031916

4 Commits
c33a1e3c80 ... 3da6e02814

Author SHA1 Message Date
zty 3da6e02814 feat: ofm-borrow 修改档案借阅审批流 2025-10-15 15:43:02 +08:00
zty f3b24924f3 Revert "fix:预定功能完善" 恢复到当前最新版本 
This reverts commit 1f63a0741d.
 2025-10-15 15:18:54 +08:00
zty 4bb288cc16 Revert "fix:问题修正" 回退到 10-11 日最后一次提交 
This reverts commit 8722d6de5d.
 2025-10-15 13:40:21 +08:00
zty b4b1f92c9a Revert "fix:检验设备默认上一次的设备" 
This reverts commit f968b951f4.
 2025-10-15 13:15:30 +08:00
6 changed files with 96 additions and 107 deletions
Show Stats Expand all files Collapse all files

137
src/views/ofm/booking_form.vue
View File

@ -37,19 +37,18 @@
</el-col>
<el-col :span="12">
<el-form-item label="会议时间" prop="mdate">
<el-date-picker v-model="form.mdate" type="date" value-format="YYYY-MM-DD" style="width: 100%;" placeholder="请选择会议时间" @change="mdateChange"></el-date-picker>
<el-date-picker v-model="form.mdate" type="date" value-format="YYYY-MM-DD" style="width: 100%;" placeholder="请选择会议时间"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注">
<el-input v-model="form.note" clearable placeholder="备注"></el-input>
<el-input v-model="form.title" clearable placeholder="备注"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<div v-for="(item,$index) in timesList" :key="item.value">
<div v-if="item.sloted" class="timeBlock slotedTimeBlock" @click="slotMessage">{{ item.label }}</div>
<div v-else-if="item.isSelect" class="timeBlock selectedTimeBlock" @click="selectTime($index)">{{ item.label }}</div>
<div v-if="item.isSelect" class="timeBlock selectedTimeBlock" @click="selectTime($index)">{{ item.label }}</div>
<div v-else class="timeBlock" @click="selectTime($index)">{{ item.label }}</div>
</div>
</el-row>
@ -133,54 +132,54 @@ export default {
title: [{ required: true, message: "请输入容纳人数", trigger: "blur" }],
},
timesList:[
{value:0,label:'00:00-00:30',isSelect:false,sloted:false},
{value:1,label:'00:30-01:00',isSelect:false,sloted:false},
{value:2,label:'01:00-01:30',isSelect:false,sloted:false},
{value:3,label:'01:30-02:00',isSelect:false,sloted:false},
{value:4,label:'02:00-02:30',isSelect:false,sloted:false},
{value:5,label:'02:30-03:00',isSelect:false,sloted:false},
{value:6,label:'03:00-03:30',isSelect:false,sloted:false},
{value:7,label:'03:30-04:00',isSelect:false,sloted:false},
{value:8,label:'04:00-04:30',isSelect:false,sloted:false},
{value:9,label:'04:30-05:00',isSelect:false,sloted:false},
{value:10,label:'05:00-05:30',isSelect:false,sloted:false},
{value:11,label:'05:30-06:00',isSelect:false,sloted:false},
{value:12,label:'06:00-06:30',isSelect:false,sloted:false},
{value:13,label:'06:30-07:00',isSelect:false,sloted:false},
{value:14,label:'07:00-07:30',isSelect:false,sloted:false},
{value:15,label:'07:30-08:00',isSelect:false,sloted:false},
{value:16,label:'08:00-08:30',isSelect:false,sloted:false},
{value:17,label:'08:30-09:00',isSelect:false,sloted:false},
{value:18,label:'09:00-09:30',isSelect:false,sloted:false},
{value:19,label:'09:30-10:00',isSelect:false,sloted:false},
{value:20,label:'10:00-10:30',isSelect:false,sloted:false},
{value:21,label:'10:30-11:00',isSelect:false,sloted:false},
{value:22,label:'11:00-11:30',isSelect:false,sloted:false},
{value:23,label:'11:30-12:00',isSelect:false,sloted:false},
{value:24,label:'12:00-12:30',isSelect:false,sloted:false},
{value:25,label:'12:30-13:00',isSelect:false,sloted:false},
{value:26,label:'13:00-13:30',isSelect:false,sloted:false},
{value:27,label:'13:30-14:00',isSelect:false,sloted:false},
{value:28,label:'14:00-14:30',isSelect:false,sloted:false},
{value:29,label:'14:30-15:00',isSelect:false,sloted:false},
{value:30,label:'15:00-15:30',isSelect:false,sloted:false},
{value:31,label:'15:30-16:00',isSelect:false,sloted:false},
{value:32,label:'16:00-16:30',isSelect:false,sloted:false},
{value:33,label:'16:30-17:00',isSelect:false,sloted:false},
{value:34,label:'17:00-17:30',isSelect:false,sloted:false},
{value:35,label:'17:30-18:00',isSelect:false,sloted:false},
{value:36,label:'18:00-18:30',isSelect:false,sloted:false},
{value:37,label:'18:30-19:00',isSelect:false,sloted:false},
{value:38,label:'19:00-19:30',isSelect:false,sloted:false},
{value:39,label:'19:30-20:00',isSelect:false,sloted:false},
{value:40,label:'20:00-20:30',isSelect:false,sloted:false},
{value:41,label:'20:30-21:00',isSelect:false,sloted:false},
{value:42,label:'21:00-21:30',isSelect:false,sloted:false},
{value:43,label:'21:30-22:00',isSelect:false,sloted:false},
{value:44,label:'22:00-22:30',isSelect:false,sloted:false},
{value:45,label:'22:30-23:00',isSelect:false,sloted:false},
{value:46,label:'23:00-23:30',isSelect:false,sloted:false},
{value:47,label:'23:30-24:00',isSelect:false,sloted:false}
{value:0,label:'00:00-00:30',isSelect:false},
{value:1,label:'00:30-01:00',isSelect:false},
{value:2,label:'01:00-01:30',isSelect:false},
{value:3,label:'01:30-02:00',isSelect:false},
{value:4,label:'02:00-02:30',isSelect:false},
{value:5,label:'02:30-03:00',isSelect:false},
{value:6,label:'03:00-03:30',isSelect:false},
{value:7,label:'03:30-04:00',isSelect:false},
{value:8,label:'04:00-04:30',isSelect:false},
{value:9,label:'04:30-05:00',isSelect:false},
{value:10,label:'05:00-05:30',isSelect:false},
{value:11,label:'05:30-06:00',isSelect:false},
{value:12,label:'06:00-06:30',isSelect:false},
{value:13,label:'06:30-07:00',isSelect:false},
{value:14,label:'07:00-07:30',isSelect:false},
{value:15,label:'07:30-08:00',isSelect:false},
{value:16,label:'08:00-08:30',isSelect:false},
{value:17,label:'08:30-09:00',isSelect:false},
{value:18,label:'09:00-09:30',isSelect:false},
{value:19,label:'09:30-10:00',isSelect:false},
{value:20,label:'10:00-10:30',isSelect:false},
{value:21,label:'10:30-11:00',isSelect:false},
{value:22,label:'11:00-11:30',isSelect:false},
{value:23,label:'11:30-12:00',isSelect:false},
{value:24,label:'12:00-12:30',isSelect:false},
{value:25,label:'12:30-13:00',isSelect:false},
{value:26,label:'13:00-13:30',isSelect:false},
{value:27,label:'13:30-14:00',isSelect:false},
{value:28,label:'14:00-14:30',isSelect:false},
{value:29,label:'14:30-15:00',isSelect:false},
{value:30,label:'15:00-15:30',isSelect:false},
{value:31,label:'15:30-16:00',isSelect:false},
{value:32,label:'16:00-16:30',isSelect:false},
{value:33,label:'16:30-17:00',isSelect:false},
{value:34,label:'17:00-17:30',isSelect:false},
{value:35,label:'17:30-18:00',isSelect:false},
{value:36,label:'18:00-18:30',isSelect:false},
{value:37,label:'18:30-19:00',isSelect:false},
{value:38,label:'19:00-19:30',isSelect:false},
{value:39,label:'19:30-20:00',isSelect:false},
{value:40,label:'20:00-20:30',isSelect:false},
{value:41,label:'20:30-21:00',isSelect:false},
{value:42,label:'21:00-21:30',isSelect:false},
{value:43,label:'21:30-22:00',isSelect:false},
{value:44,label:'22:00-22:30',isSelect:false},
{value:45,label:'22:30-23:00',isSelect:false},
{value:46,label:'23:00-23:30',isSelect:false},
{value:47,label:'23:30-24:00',isSelect:false}
],
mRoomList: [],
timeselectList: [],
@ -191,7 +190,7 @@ export default {
that.getmRoomList();
that.getTid();
if(that.type=='add'){
that.form.belong_dept = that.$TOOL.data.get("USER_INFO").belong_dept;
that.form.belong_dept = that.$TOOL.data.get("USER_INFO").dept_id;
}
if(that.type=='edit'||that.type=='show'){
that.form = that.bookingIitem;
@ -226,34 +225,9 @@ export default {
if(item.id == that.form.mroom){
that.mroomName = item.name;
that.bookingTitle = item.name+"预定";
if(that.form.mdate!==''&&that.form.mdate!==null){
that.getmRoomSlot();
}
}
})
},
mdateChange(){
let that = this;
if(that.form.mroom!==''&&that.form.mroom!==null){
that.getmRoomSlot();
}
},
getmRoomSlot(){
let that = this;
let form = {};
form.page = 0;
form.mroom = that.form.mroom;
form.mdate = that.form.mdate;
that.timesList.forEach(slot=>{
slot.sloted = false;
})
that.$API.ofm.mroomslot.list.req(form).then(res=>{
console.log('getmRoomSlot',res);
res.forEach(item=>{
that.timesList[item.slot].sloted = true;
})
})
},
selectTime(index){
let that = this;
that.form.slots = [];
@ -310,10 +284,7 @@ export default {
handleQuery() {
this.$refs.table.queryData(this.query);
},
slotMessage(){
this.$message.warning("该时间段已被预约，不可选择");
},
},
};
</script>
@ -340,9 +311,5 @@ export default {
background-color: #00a870;
color: #fff;
}
.slotedTimeBlock{
background-color: #fac275;
color: #fff;
}
</style>

25
src/views/ofm/borrowfile.vue
View File

@ -71,7 +71,7 @@
v-auth="'fileborrow.update'"
>详情
</el-button>
<!-- <el-popconfirm
<el-popconfirm
title="确定删除吗？"
@confirm="borrowDel(scope.row)"
>
@ -84,7 +84,7 @@
>删除</el-button
>
</template>
</el-popconfirm> -->
</el-popconfirm>
</template>
</el-table-column>
</scTable>
@ -100,7 +100,6 @@
<borrowlForm
:mode="type"
v-model="addForm"
:lending_type="lending_type"
@success="()=>{handleQuery(); limitedVisible = false}"
@closed="limitedVisible = false"
/>
@ -193,16 +192,16 @@ export default {
this.limitedVisible = true;
this.addForm = Object.assign({}, row);
},
// async borrowDel(row) {
// var id = row.id;
// var res = await this.$API.ofm.borrow.delete.req(id);
// if (res.err_msg) {
// this.$message.error(res.err_msg);
// } else {
// this.$refs.table.refresh();
// this.$message.success("删除成功");
// }
// },
async borrowDel(row) {
var id = row.id;
var res = await this.$API.ofm.borrow.delete.req(id);
if (res.err_msg) {
this.$message.error(res.err_msg);
} else {
this.$refs.table.refresh();
this.$message.success("删除成功");
}
},
//搜索
handleQuery() {
this.$refs.table.queryData(this.query);

31
src/views/ofm/borrowfile_form.vue
View File

@ -32,14 +32,13 @@
>
</el-date-picker>
</el-form-item>
<el-form-item label="归还时间" prop="return_date">
<el-form-item label="归还时间" prop="return_date" v-if="addForm.ticket_?.state_?.name=='档案管理员审批'">
<el-date-picker
v-model="addForm.return_date"
type="date"
placeholder="选择日期时间"
align="right"
value-format="YYYY-MM-DD"
:disabled="mode==='view'"
>
</el-date-picker>
</el-form-item>
@ -58,16 +57,17 @@
:title="ticketTitle"
:t_id="addForm.id"
:ticket_="addForm.ticket_"
:ticket_data="ticket_data"
:submit_b_func="submit"
ref="ticketd_b_start"
@success="$emit('success')"
/>
<el-button @click="$emit('closed')">取消</el-button>
</el-footer>
</el-main>
<el-aside v-if="addForm.ticket">
<ticketd
:ticket_="addForm.ticket_"
:ticket_data="ticket_data"
@success="$emit('success')"
style="margin-top: 20px;"
/>
@ -97,6 +97,7 @@ export default {
addForm: {...this.modelValue},
query: {},
fileList: [],
ticket_data: {},
rules: {
file_name: [
{ required: true, message: "请选择档案", trigger: "blur" },
@ -107,11 +108,33 @@ export default {
mounted(){
this.getFileList();
},
watch: {
modelValue: {
handler(val) {
this.addForm = { ...val };
},
deep: true,
},
// 本地数据变动 -> 同步回父组件
addForm: {
handler(val) {
this.$emit("update:modelValue", val);
},
deep: true,
},
addForm: {
handler(val){
Object.assign(this.ticket_data,{
return_date: val.return_date,
})
},
deep: true,
}
},
methods: {
async submit() {
let that = this;
let res = null;
this.ticketTitle = `${this.addForm.file_name}-档案借阅`;
if (that.mode === "add") {
res = await that.$API.ofm.borrow.create.req(that.addForm);

1
src/views/ofm/mroombooking.vue
View File

@ -66,7 +66,6 @@
</el-container>
<el-drawer :title="titleMap[type]" v-model="limitedVisible" :size="'80%'">
<bookingDialog
v-if="limitedVisible"
:type="type"
:editId="editId"
:bookingIitem="bookingIitem"

1
src/views/ofm/vehicle.vue
View File

@ -124,7 +124,6 @@
:transitions="transitions"
@success="()=>{handleQuery(); limitedVisible = false}"
@closed="limitedVisible = false"
@submit="saveVehicle"
/>
</div>
</div>

8
src/views/wpm_bx/mlogbw_check_table.vue
View File

@ -503,10 +503,8 @@ export default {
},
getEquipments(){
let that = this;
let eqId = localStorage.getItem("bxerpChenckEquipmentId");
that.$API.em.equipment.list.req({page:0,cate__code:"6"}).then((res) => {
that.equipmentOptions = res;
that.form.equipment = eqId;
})
},
getdefects(){
@ -753,6 +751,11 @@ export default {
if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){
let str = item.rule_expression.replace(/`/g, '');
str = str.replace(/\${(.*?)}/g, 'row.\$1');
// if(str.indexOf('row.剪切值18mm')>-1){
// if(row.剪切值18mm==null||row.剪切值18mm==''||row.剪切值18mm==undefined){
// str = str.split('||')[0];
// }
// }
let judge = false;
try {
judge = eval(str);
@ -806,7 +809,6 @@ export default {
},
equipmentChange(){
let that = this;
localStorage.setItem("bxerpChenckEquipmentId",that.form.equipment);
that.equipmentOptions.forEach(item => {
if(item.id == that.form.equipment){
that.form.equipment_name = item.name;