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

Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

This commit is contained in:
曹前明 2022-06-09 08:14:28 +08:00
parent 888185c4c0 2e5b24b370
commit 8573e96ff2
3 changed files with 83 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hb_client/src/views/bigScreen/centerRight1.vue
View File

@ -9,10 +9,13 @@
<span class="fs-xl text mx-2">人员到岗情况</span>
</div>
</div>
<div>
<div class="d-flex jc-center body-box">
<dv-scroll-board class="dv-scr-board" :config="userConfig" />
</div>
</div>
</div>
</div>
</template>
<script>

12
hb_client/src/views/bigScreen/index.vue
View File

@ -300,7 +300,7 @@
},
//人员到岗
userConfig: {
header: ['姓名', '到岗情况'],
header: ['姓名', '到岗情况','部门'],
data: [
['冯宝宝', "<span class='colorGrass'>已到岗</span>"]
],
@ -420,7 +420,7 @@
],
limitedTwo: false,
configArticle: {
header: ['标题', '置顶', '作者', '发布时间'],
header: ['标题', '置顶', '发布时间'],
data: [
['郑成功', '2022-03-05'],
['冯宝宝', '2022-03-05']
@ -669,6 +669,7 @@
that.listUser = false;
getEmployee({page: 0,type:'big_screen',show_atwork:true}).then((response) => {
if (response.data) {
// debugger;
let list = response.data;
let data = [];
list.forEach(item => {
@ -676,10 +677,11 @@
obj.push(item.name);
// obj.push(item.dept_.name);
if (item.is_atwork) {
obj.push("<span class='colorGrass'>已到岗</span>")
obj.push("<span style='display: inline-block' class='colorGrass roll-table-item'>已到岗</span>")
} else {
obj.push("<span class='colorRed'>未到岗</span>")
obj.push("<span style='display: inline-block' class='colorRed roll-table-item'>未到岗</span>")
}
obj.push(item.dept_.name);
data.push(obj)
});
that.userConfig.data = data;
@ -704,7 +706,7 @@
} else {
obj.push('已置顶');
}
obj.push(item.author);
// obj.push(item.author);
obj.push(item.create_time);
data.push(obj)
});

26
hb_client/src/views/mtm/step.vue
View File

@ -241,23 +241,28 @@
</div>
</el-dialog>
<el-dialog
class="bigDialog"
:model="tableForm"
:close-on-click-modal="false"
:visible.sync="dialogVisibleForm"
:title="tableForm.name">
<el-form
label-width="180px"
label-width="200px"
label-position="right"
>
<el-row v-for="(item,$index) in dialogFieldList" :key="$index">
<el-row style="box-sizing: border-box;padding-right: 50px">
<el-col v-for="(item,$index) in dialogFieldList" :key="$index" :span="12">
<el-form-item v-if="item.field_type==='string'" :label="item.field_name">
<el-input placeholder="请输入" v-model="item.low_limit"/>
<span v-if="item.help_text!==''&&item.help_text">{{item.help_text}}</span>
</el-form-item>
<el-form-item v-else-if="item.field_type==='int'" :label="item.field_name">
<el-input type="number" placeholder="请输入" v-model="item.low_limit"/>
<span v-if="item.help_text!==''&&item.help_text">{{item.help_text}}</span>
</el-form-item>
<el-form-item v-else-if="item.field_type==='float'" :label="item.field_name">
<el-input type="number" placeholder="请输入" v-model="item.low_limit"/>
<span v-if="item.help_text!==''&&item.help_text">{{item.help_text}}</span>
</el-form-item>
<el-form-item v-else-if="item.field_type==='date'" :label="item.field_name">
<el-date-picker
@ -268,6 +273,7 @@
style="width:100%"
>
</el-date-picker>
<span v-if="item.help_text!==''&&item.help_text">{{item.help_text}}</span>
</el-form-item>
<el-form-item v-else-if="item.field_type==='datetime'" :label="item.field_name">
<el-date-picker
@ -278,6 +284,7 @@
style="width:100%"
>
</el-date-picker>
<span v-if="item.help_text!==''&&item.help_text">{{item.help_text}}</span>
</el-form-item>
<el-form-item v-else-if="item.field_type==='select'" :label="item.field_name">
<el-select style="width: 100%" placeholder="请选择">
@ -289,6 +296,7 @@
:value="item1">
</el-option>
</el-select>
<span v-if="item.help_text!==''&&item.help_text">{{item.help_text}}</span>
</el-form-item>
<el-form-item v-else-if="item.field_type==='selects'" :label="item.field_name">
<el-select style="width: 100%" multiple placeholder="请选择">
@ -300,7 +308,9 @@
:value="item1">
</el-option>
</el-select>
<span v-if="item.help_text!==''&&item.help_text">{{item.help_text}}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
@ -342,6 +352,9 @@
<el-table-column label="选项显示名">
<template slot-scope="scope">{{ scope.row.field_choice }}</template>
</el-table-column>
<el-table-column label="字段说明">
<template slot-scope="scope">{{ scope.row.help_text }}</template>
</el-table-column>
<el-table-column
align="center"
label="操作"
@ -388,7 +401,7 @@
<el-input
v-model="field.field_key"
placeholder="字段标识"
onkeyup="value=value.replace(/[^0-9A-Za-z]/g,'')"
@input="checkValue"
/>
</el-form-item>
<el-form-item label="字段名称" prop="field_name">
@ -459,6 +472,7 @@
enabled: true
};
const defaultfield = {};
const defaultfield1 = {field_type: '', field_key: '', field_name: '', sort: '', field_choice: [""],};
export default {
components: {Pagination, vueJsonEditor},
data() {
@ -593,6 +607,9 @@
this.getFormList();
},
methods: {
checkValue() {
this.field.field_key = this.field.field_key.replace(/[^0-9a-zA-Z]/g, '');
},
getProductList(){
getMaterialList({page:0,type:1}).then((response) => {
if (response.data) {
@ -784,9 +801,10 @@
//新增字段
handlefieldCreate() {
this.field_choice = [''];
this.field = Object.assign({}, defaultfield);
this.field = Object.assign({}, defaultfield1);
this.dialogType1 = "new";
this.dialogVisible1 = true;
this.$nextTick(() => {
this.$refs["Form"].clearValidate();
});