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

cording0324

This commit is contained in:
shijing 2022-03-24 14:01:21 +08:00
parent c0d96cb735
commit b02dc30eb3
4 changed files with 751 additions and 674 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hb_client/src/views/dashboard/index.vue
View File

@ -218,7 +218,7 @@
:height="cardTabelHeight"
style="border-top: 1px solid #f5f5f5;"
>
<el-table-column label="id" prop="id" width="50">
<el-table-column type="index" width="50">
</el-table-column>
<el-table-column label="人员名称" prop="name" show-overflow-tooltip>
</el-table-column>
@ -233,7 +233,7 @@
</template>
</el-table-column>
<el-table-column label="部门" prop="dept_">
<template slot-scope="scope">{{scope.row.dept_.name}}</template>
<template slot-scope="scope" v-if="scope.row.dept_">{{scope.row.dept_.name}}</template>
</el-table-column>
</el-table>
</div>
@ -585,7 +585,7 @@
let that = this;
that.listLoadingUser = true;
that.userPage = 1;
getEmployee({page: that.userPage, page_size: that.userPageSize}).then((response) => {
getEmployee({page: that.userPage, page_size: that.userPageSize,show_atwork:true}).then((response) => {
if (response.data) {
that.userList = response.data.results;
that.userTotal = response.data.count;
@ -602,6 +602,7 @@
that.userPage = val;
getEmployee({
page: val,
show_atwork:true,
page_size: that.userPageSize,
fields: 'id,name,dept_name,is_atwork'
}).then((response) => {

97
hb_client/src/views/inm/fifodetail.vue
View File

@ -6,8 +6,9 @@
type="primary"
icon="el-icon-plus"
@click="handlecgxCreate"
>新增采购项入库</el-button
>
新增采购项入库
</el-button>
<el-table
v-loading="listLoading"
:data="fifodetailList.results"
@ -27,19 +28,14 @@
<template slot-scope="scope">{{ scope.row.batch }}</template>
</el-table-column>
<el-table-column label="物料编号">
<template slot-scope="scope">{{
scope.row.material_.number
}}</template>
<template slot-scope="scope">{{scope.row.material_.number}}</template>
</el-table-column>
<el-table-column label="物料单位">
<template slot-scope="scope">{{ scope.row.material_.unit }}</template>
</el-table-column>
<el-table-column label="物料型号">
<template slot-scope="scope">{{
scope.row.material_.specification
}}</template>
<template slot-scope="scope">{{scope.row.material_.specification}}</template>
</el-table-column>
<el-table-column label="出入库数量">
<template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column>
@ -70,24 +66,25 @@
<div v-for="item in scope.row.files_" v-bind:key="item.id">
<el-link :href="item.path" target="_blank" type="primary">{{
item.name
}}</el-link>
}}
</el-link>
</div>
</template>
</el-table-column>
<el-table-column
v-if="this.$route.params.pu_order != null"
align="center"
label="操作"
width="220px"
v-if="this.$route.params.pu_order != null"
>
<template slot-scope="scope">
<el-link
v-if="scope.row.need_test"
type="primary"
@click="handleMaterial(scope)"
v-if="scope.row.need_test"
>复验</el-link
>
复验
</el-link>
<el-link type="primary" @click="handleEdit(scope)">上传</el-link>
</template>
</el-table-column>
@ -113,8 +110,8 @@
:rules="rule1"
>
<el-row :gutter="24">
<el-col :span="12"
><div class="grid-content bg-purple">
<el-col :span="12">
<div class="grid-content bg-purple">
<el-form-item label="采购订单项目" :prop="pu_order_item">
<el-select v-model="inpur.pu_order_item" @change="showmessage">
<el-option
@ -125,39 +122,42 @@
>
</el-option>
</el-select>
</el-form-item></div
></el-col>
<el-col :span="12"
><div class="grid-content bg-purple">
</el-form-item>
</div>
</el-col>
<el-col :span="12">
<div class="grid-content bg-purple">
<el-form-item label="采购数量">
<el-input v-model="puorderItemdetial.count" :disabled="true">
</el-input>
</el-form-item></div
></el-col>
</el-form-item>
</div>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12"
><div class="grid-content bg-purple">
<el-col :span="12">
<div class="grid-content bg-purple">
<el-form-item label="到货时间">
<el-input
v-model="puorderItemdetial.delivery_date"
:disabled="true"
>
</el-input>
</el-form-item></div
></el-col>
<el-col :span="12"
><div class="grid-content bg-purple">
</el-form-item>
</div>
</el-col>
<el-col :span="12">
<div class="grid-content bg-purple">
<el-form-item label="到货数量">
<el-input
v-model="puorderItemdetial.delivered_count"
:disabled="true"
>
</el-input>
</el-form-item></div
></el-col>
</el-form-item>
</div>
</el-col>
</el-row>
<el-form-item label="仓库" :prop="warehouse">
<el-select v-model="inpur.warehouse">
<el-option
@ -188,14 +188,13 @@
</el-form>
<div style="text-align: right">
<el-button type="danger" @click="dialogVisibles = false"
>取消</el-button
>
>取消
</el-button>
<el-button type="primary" @click="confirminpur('Form1')"
>确认</el-button
>
>确认
</el-button>
</div>
</el-dialog>
<el-dialog
:close-on-click-modal="false"
:visible.sync="dialogVisible"
@ -210,7 +209,6 @@
<el-form-item label="是否需要复验" prop="need_test">
<el-switch v-model="FIFOItem.need_test"></el-switch>
</el-form-item>
<el-form-item label="文件列表">
<el-upload
ref="upload"
@ -239,7 +237,8 @@
></i>
<el-link :href="item.path" target="_blank" type="primary">{{
item.name
}}</el-link>
}}
</el-link>
</div>
</el-form>
<div style="text-align: right">
@ -282,9 +281,9 @@
:label="item.field_name"
>
<el-input
v-model="item.sort"
type="number"
placeholder="请输入"
v-model="item.sort"
/>
</el-form-item>
<el-form-item
@ -292,9 +291,9 @@
:label="item.field_name"
>
<el-input
v-model="item.sort"
type="number"
placeholder="请输入"
v-model="item.sort"
/>
</el-form-item>
<el-form-item
@ -371,16 +370,16 @@
<div slot="footer" class="dialog-footer">
<el-button @click="innerVisible = false">取 消</el-button>
<el-button type="primary" @click="submitfield"
>提交检查项目</el-button
>
<el-button type="primary" @click="submitfield">
提交检查项目
</el-button>
</div>
</el-dialog>
<div slot="footer" class="dialog-footer">
<el-button @click="outerVisible = false">取 消</el-button>
<el-button type="primary" @click="submitrecordform"
>填写检查项目</el-button
>
<el-button type="primary" @click="submitrecordform">
填写检查项目
</el-button>
</div>
</el-dialog>
</div>
@ -457,7 +456,8 @@ export default {
created() {
this.getList();
},
mounted() {},
mounted() {
},
methods: {
checkPermission,
@ -551,7 +551,8 @@ export default {
.then(() => {
this.fileList.splice(index, 1);
})
.catch((e) => {});
.catch((e) => {
});
},
yeschange(val) {
if (!val) {
@ -592,7 +593,7 @@ export default {
this.outerVisible = true;
this.fifo_detail = scope.row.id;
this.listQueryrecordform.material = scope.row.material;
this.listQueryrecordform.type = 2;
this.listQueryrecordform.type = 30;
getrecordformList(this.listQueryrecordform).then((response) => {
if (response.data) {
this.recordformList = response.data;

153
hb_client/src/views/qm/admissiontest.vue
View File

@ -21,9 +21,7 @@
<template slot-scope="scope">{{ scope.row.material_.name }}</template>
</el-table-column>
<el-table-column label="规格型号">
<template slot-scope="scope">{{
scope.row.material_.specification
}}</template>
<template slot-scope="scope">{{scope.row.material_.specification}}</template>
</el-table-column>
<el-table-column label="物料单位">
<template slot-scope="scope">{{ scope.row.material_.unit }}</template>
@ -31,22 +29,47 @@
<el-table-column label="总数量">
<template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column>
<el-table-column label="检查状态">
<!--<el-table-column label="检查状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.is_tested == false">未检查</el-tag>
<el-tag v-else>已检查</el-tag>
</template>
</el-table-column>
</el-table-column>-->
<el-table-column label="检查是否合格">
<template slot-scope="scope" v-if="scope.row.is_tested == true">
<template slot-scope="scope">
<el-tag v-if="scope.row.is_testok == false">不合格</el-tag>
<el-tag v-else>合格</el-tag>
</template>
</el-table-column>
<el-table-column label="是否需要复验">
<template slot-scope="scope">
<el-tag v-if="scope.row.need_test">是</el-tag>
<el-tag v-else>否</el-tag>
</template>
</el-table-column>
<el-table-column label="文件">
<template slot-scope="scope" v-if="scope.row.files">
<div v-for="item in scope.row.files_" v-bind:key="item.id">
<el-link :href="item.path" target="_blank" type="primary">{{item.name}}</el-link>
</div>
</template>
</el-table-column>
<el-table-column label="创建时间">
<template slot-scope="scope">{{scope.row.create_time}}</template>
</el-table-column>
<el-table-column
align="center"
label="操作"
>
<template slot-scope="scope">
<el-link
type="primary"
@click="handleRecord(scope)"
>
复验记录
</el-link>
</template>
</el-table-column>
</el-table>
<pagination
v-show="fifodetailList1.count > 0"
@ -55,7 +78,6 @@
:limit.sync="listQuery1.page_size"
@pagination="getList1"
/>
</el-tab-pane>
<el-tab-pane label="待检物料" name="2">
<el-table
@ -76,9 +98,7 @@
<template slot-scope="scope">{{ scope.row.material_.name }}</template>
</el-table-column>
<el-table-column label="规格型号">
<template slot-scope="scope">{{
scope.row.material_.specification
}}</template>
<template slot-scope="scope">{{scope.row.material_.specification}}</template>
</el-table-column>
<el-table-column label="物料单位">
<template slot-scope="scope">{{ scope.row.material_.unit }}</template>
@ -86,11 +106,9 @@
<el-table-column label="总数量">
<template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column>
<el-table-column label="创建时间">
<template slot-scope="scope">{{ scope.row.create_time }}</template>
</el-table-column>
</el-table>
<pagination
v-show="fifodetailList2.count > 0"
@ -119,9 +137,7 @@
<template slot-scope="scope">{{ scope.row.material_.name }}</template>
</el-table-column>
<el-table-column label="规格型号">
<template slot-scope="scope">{{
scope.row.material_.specification
}}</template>
<template slot-scope="scope">{{scope.row.material_.specification}}</template>
</el-table-column>
<el-table-column label="物料单位">
<template slot-scope="scope">{{ scope.row.material_.unit }}</template>
@ -129,15 +145,47 @@
<el-table-column label="仓库">
<template slot-scope="scope">{{ scope.row.warehouse_.name }}</template>
</el-table-column>
<el-table-column label="入库数量">
<template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column>
<el-table-column label="是否需要复验">
<template slot-scope="scope">
<el-tag v-if="scope.row.need_test">是</el-tag>
<el-tag v-else>否</el-tag>
</template>
</el-table-column>
<el-table-column label="文件">
<template slot-scope="scope" v-if="scope.row.files">
<div v-for="item in scope.row.files_" v-bind:key="item.id">
<el-link :href="item.path" target="_blank" type="primary">{{item.name}}</el-link>
</div>
</template>
</el-table-column>
<el-table-column label="创建时间">
<template slot-scope="scope">{{ scope.row.create_time }}</template>
</el-table-column>
<el-table-column
align="center"
label="操作"
>
<template slot-scope="scope">
<el-link
v-if="scope.row.need_test"
type="primary"
@click="handleRecord(scope)"
>
复验记录
</el-link>
<el-link
v-else
type="info"
:disabled="!scope.row.need_test"
@click="handleRecord(scope)"
>
复验记录
</el-link>
</template>
</el-table-column>
</el-table>
<pagination
v-show="fifodetailList3.count > 0"
@ -166,18 +214,49 @@
<template slot-scope="scope">{{ scope.row.material_.name }}</template>
</el-table-column>
<el-table-column label="规格型号">
<template slot-scope="scope">{{
scope.row.material_.specification
}}</template>
<template slot-scope="scope">{{scope.row.material_.specification}}</template>
</el-table-column>
<el-table-column label="物料单位">
<template slot-scope="scope">{{ scope.row.material_.unit }}</template>
</el-table-column>
<el-table-column label="文件">
<template slot-scope="scope" v-if="scope.row.files">
<div v-for="item in scope.row.files_" v-bind:key="item.id">
<el-link :href="item.file" target="_blank" type="primary">{{item.name}}</el-link>
</div>
</template>
</el-table-column>
<el-table-column label="是否需要复验">
<template slot-scope="scope">
<el-tag v-if="scope.row.need_test">是</el-tag>
<el-tag v-else>否</el-tag>
</template>
</el-table-column>
<el-table-column label="创建时间">
<template slot-scope="scope">{{ scope.row.create_time }}</template>
</el-table-column>
<el-table-column
align="center"
label="操作"
>
<template slot-scope="scope">
<el-link
v-if="scope.row.need_test"
type="primary"
@click="handleRecord(scope)"
>
复验记录
</el-link>
<el-link
v-else
type="info"
:disabled="!scope.row.need_test"
@click="handleRecord(scope)"
>
复验记录
</el-link>
</template>
</el-table-column>
</el-table>
<pagination
v-show="fifodetailList4.count > 0"
@ -188,12 +267,7 @@
/>
</el-tab-pane>
</el-tabs>
</el-card>
</div>
</template>
<script>
@ -299,25 +373,20 @@ export default {
},
//选项卡切换
handleClick(tab) {
if(tab.name==1)
{
if (tab.name == 1) {
this.getList1()
}
else if(tab.name==2)
{
} else if (tab.name == 2) {
this.getList2()
}
else if(tab.name==3)
{
} else if (tab.name == 3) {
this.getList3()
}
else
{
} else {
this.getList4()
}
},
//检验记录
handleRecord(){
},
},
};
</script>

14
hb_client/src/views/qm/product.vue
View File

@ -35,15 +35,21 @@
<el-table-column label="合同">
<template slot-scope="scope">
<span v-if="scope.row.to_order_">{{scope.row.to_order_.contract_.name}}</span>
<span v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"></span>
<span v-else></span>
<!--<span v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"></span>
<span v-else></span>-->
</template>
</el-table-column>
<el-table-column label="监管协议号">
<template slot-scope="scope">
<span v-if="scope.row.to_order_">{{scope.row.to_order_.contract_.watch_num}}</span>
<!--<span v-else>{{scope.row.order_.contract_.watch_num}}</span>-->
</template>
</el-table-column>
<el-table-column label="客户">
<template slot-scope="scope">
<span v-if="scope.row.to_order_">{{scope.row.to_order_.customer_.name}}</span>
<span v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"></span>
<span v-else></span>
<!--<span v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"></span>-->
<!--<span v-else></span>-->
</template>
</el-table-column>
<el-table-column label="军检">