modified: src/api/inspection/commisioninspection.js modified: src/api...

zouyu

2023-08-31 b723865e2b3ad6032d10deda501644ebabef8368

	modified:   src/api/inspection/commisioninspection.js
	modified:   src/api/inspection/rawmaterial.js
	modified:   src/views/inspectionManagement/commissionInspection/index.vue
	modified:   src/views/inspectionManagement/reportForInspection/index.vue

 src/api/inspection/commisioninspection.js

@@ -96,3 +96,19 @@
        params
  })
}

export function chooseVersion(params){
  return request({
    url: '/link-basic-table/chooseVer',
    method: 'get',
        params
  })
}

export function lookProByVer(params){
  return request({
    url: '/link-basic-table/lookProByVer',
    method: 'get',
        params
  })
}

 src/api/inspection/rawmaterial.js

@@ -12,7 +12,7 @@
//新增报检单
export function addInspect(data){
  return request({
    url: '/inspection/addInspect',
    url: '/raw-material/addInspect',
    method: 'post',
    data
  })

 src/views/inspectionManagement/commissionInspection/index.vue

@@ -53,15 +53,15 @@
                            </el-radio-group>
                        </div>
                        <div class="generateInsp">
                            <el-button type="primary" size="mini" icon="el-icon-document"
                            <el-button @click="addReportBtn" type="primary" size="mini" icon="el-icon-document"
                                style="background-color: rgb(1, 102, 226);">生成报检单</el-button>
                        </div>
                    </div>
                    <div class="table-box">
                        <el-table ref="commisionTable" :max-height="800" :cell-style="{textAlign: 'center'}"
                            :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                            :data="commisionTable" style="width: 100%">
                            <el-table-column type="selection" min-width="10%" />
                            :data="commisionTable" @selection-change="handleSelectionChange" style="width: 100%">
                            <el-table-column type="selection" :selectable="checkSelect" min-width="10%" />
                            <el-table-column type="index" label="序号" min-width="10%" />
                            <el-table-column prop="entrust_coding" label="委托编号" min-width="10%" />
                            <el-table-column prop="entrusted" label="委托单位" min-width="12%" />
@@ -126,6 +126,33 @@
        </el-dialog>
        <!-- 隐藏域输入框用来复制 -->
        <input id="copyContext" style="position: absolute;top: 0;left: 0;opacity: 0;z-index: -10;" />
        <el-dialog title="选择日期" :visible.sync="addReportDialog" width="60%">
            <el-form :model="addInspectionForm" :rules="addInspectionFormRules" ref="addInspectionForm">
                <el-form-item label="检验日期" label-width="100px" prop="inspectionDate">
                    <el-date-picker v-model="addInspectionForm.inspectionDate" type="daterange" value-format="yyyy-MM-dd"
                        range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
                    </el-date-picker>
                </el-form-item>
                <el-form-item label="当前版本" label-width="100px" prop="version">
                    <el-select @change="changeVersionFun" v-model="addInspectionForm.version" placeholder="请选择版本">
                        <el-option v-for="item in chooseVersion" :key="item.value" :label="item.label" :value="item.value" ></el-option>
                    </el-select>
                </el-form-item>
            </el-form>
            <el-table
                style="width:90%;margin-left:5%" :data="standardLibraryData" row-key="id" border
                default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
                <el-table-column type="index" width="50px" label="序号"></el-table-column>
                <el-table-column label="项目名称" prop="name" sortable></el-table-column>
                <el-table-column prop="unit" label="单位" sortable></el-table-column>
                <el-table-column label="标准值" prop="required" sortable></el-table-column>
                <el-table-column prop="internal" label="内控值" sortable></el-table-column>
            </el-table>
            <div slot="footer" class="dialog-footer">
                <el-button @click="resetForm('addInspectionForm')">取 消</el-button>
                <el-button type="primary" @click="confirmBtn('addInspectionForm')">确 定</el-button>
            </div>
        </el-dialog>
    </div>
</template>

@@ -134,11 +161,28 @@
        getCommisionList,
        getViewUUID,
        selectViewUUID,
        delLink
        delLink,
        chooseVersion,
        lookProByVer
    } from '@/api/inspection/commisioninspection'
    export default {
        data() {
            return {
                standardLibraryData:[],
                chooseVersion: [],
                addInspectionForm: {
                    inspectionDate: [],
                    version: null
                },
                addInspectionFormRules: {
                    inspectionDate: [{
                        required: true,
                        message: '请选择日期区间',
                        trigger: 'change'
                    }],
                },
                addReportDialog: false,
                checkData: [],
                form: [],
                searchData: {
                    code: '',
@@ -196,6 +240,113 @@
            }
        },
        methods: {
            resetForm(formName) {
                this.addInspectionForm.inspectionDate = [],
                this.$refs[formName].resetFields();
                this.addReportDialog = false
            },
            checkSelect(row) {
                if (row.type === 1) {
                    return false;
                } else {
                    return true;
                }
            },
            handleSelectionChange(val) {
                if (val.length > 1) {
                    this.$refs.commisionTable.clearSelection();
                    this.$refs.commisionTable.toggleRowSelection(val.pop())
                }
                this.checkData = val;
                console.log(this.checkData);
            },
            //生成报检单确认按钮
            confirmBtn(formName) {
                this.$refs[formName].validate((valid)=>{
                    if(valid){
                    // let dateArr = this.addInspectionForm.inspectionDate;
                    // //添加报检单
                    // let val = this.checkData[0];
                    // let obj = {
                    //     "endTime": dateArr[1],
                    //     "experiment": "",
                    //     "formTime": val.createTime,
                    //     "id": val.id,
                    //     "mcode": val.materialCoding,
                    //     "name": val.materialName,
                    //     "num": val.quantity,
                    //     "specifications": val.specificationsModels,
                    //     "startTime": dateArr[0],
                    //     "supplier": val.supplierName,
                    //     "type": val.type,
                    //     "unit": val.unit,
                    //     "version": this.addInspectionForm.version
                    // }
                    // // this.createReport(obj);
                    // this.addReportDialog = false;
                    // this.initNewSelection();
                    // this.showNewPage = true;
                    }
                });
            },
            //生成报检单按钮
            addReportBtn() {
                if (this.checkData.length < 1) {
                    this.$message.error("请选择一条数据!");
                } else {
                    if (this.checkData.length > 1) {
                        this.$message.error("最多选择一条数据!");
                    } else {
                        let mcode = this.checkData[0].entrust_coding;
                        let name = this.checkData[0].sample_name;
                        let specifications = this.checkData[0].specifications_models;
                        let id = this.checkData[0].id;
                        this.getChooseVersionFun(mcode,name,specifications,id);
                        this.addReportDialog = true;
                    }
                }
            },
            changeVersionFun(){
                let mCode = this.checkData[0].entrust_coding;
                let name = this.checkData[0].sample_name;
                let specifications = this.checkData[0].specifications_models;
                let version = this.addInspectionForm.version;
                let id = this.checkData[0].id;
                this.getProByVersion(mCode,name,specifications,version,id);
            },
            //获取版本下的标准库数据
            async getProByVersion(mCode,name,specifications,version,id){
                var vm = this;
                await lookProByVer({
                    id : id,
                    mcode : mCode,
                    name : name,
                    specifications : specifications,
                    version: version
                }).then((res)=>{
                    console.log(res);
                    vm.standardLibraryData = res.data;
                })
            },
            //获取版本列表
            async getChooseVersionFun(mCode,name,specifications,id){
                var vm = this;
                this.chooseVersion = [];
                await chooseVersion({
                mcode : mCode,
                name : name,
                specifications : specifications
                }).then((res)=>{
                    vm.getProByVersion(mCode,name,specifications,res.data[0],id);
                    for(let i=0;i<res.data.length;i++){
                        vm.chooseVersion.push({
                        value: res.data[i],
                        label: "V"+res.data[i]
                        });
                    }
                    vm.addInspectionForm.version = res.data[0];
                });
            },
            async getCommisionList() {
                const res = await getCommisionList({
                    pageNo: this.currentPage,
@@ -237,7 +388,6 @@
                this.commisionTable = res.data.row
                this.total = res.data.total
            },

            // 重置方法
            reset() {
                // 重置搜索条件

 src/views/inspectionManagement/reportForInspection/index.vue

@@ -64,12 +64,6 @@
            </el-dialog>
            <div class="library-table">
                <div class="table-header">
                    <div class="search-bar">
                        <el-radio-group v-model="radioValue" @change="radioclick">
                            <el-radio-button v-for="option in radioOptions" :key="option.value"
                                :label="option.value">{{ option.label }}</el-radio-button>
                        </el-radio-group>
                    </div>
                    <div class="generateInsp">
                        <el-button @click="addReportBtn" type="primary" size="mini" icon="el-icon-document"
                            style="background-color: rgb(1, 102, 226);">生成报检单</el-button>
@@ -79,8 +73,7 @@
                    <el-table ref="inspectionTable" :max-height="600" :cell-style="{textAlign: 'center'}"
                        :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                        :data="inspectionTable" style="width: 100%" @selection-change="handleSelectionChange">
                        <el-table-column type="selection" :selectable="checkSelect" min-width="5%">
                        </el-table-column>
                        <el-table-column type="selection" :selectable="checkSelect" min-width="5%"></el-table-column>
                        <el-table-column type="index" label="序号" min-width="8%" />
                        <el-table-column prop="createTime" label="来料日期" min-width="8%" />
                        <el-table-column prop="supplierName" label="供应商名称" min-width="12%" />
@@ -116,7 +109,7 @@
            </div>
        </div>
        <el-dialog title="选择日期" :visible.sync="addReportDialog" width="60%">
            <el-form :model="addInspectionForm" :rules="addInspectionFormRules" rule="addInspectionForm">
            <el-form :model="addInspectionForm" :rules="addInspectionFormRules" ref="addInspectionForm">
                <el-form-item label="检验日期" label-width="100px" prop="inspectionDate">
                    <el-date-picker v-model="addInspectionForm.inspectionDate" type="daterange" value-format="yyyy-MM-dd"
                        range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
@@ -446,8 +439,8 @@
                this.deviceoptions = res2.data;
            },
            resetForm(formName) {
                // this.addInspectionForm.inspectionDate = [],
                // this.$refs[formName].resetFields();
                this.addInspectionForm.inspectionDate = [],
                this.$refs[formName].resetFields();
                this.addReportDialog = false
            },
            removeFun(row, index) {
@@ -460,7 +453,7 @@
                    this.deleteMaterialFun(row, index);
                }).catch(() => {});
            },
            checkSelect(row, index) {
            checkSelect(row) {
                if (row.type === 1) {
                    return false;
                } else {
@@ -468,8 +461,11 @@
                }
            },
            handleSelectionChange(val) {
        if (val.length > 1) {
                    this.$refs.inspectionTable.clearSelection();
                    this.$refs.inspectionTable.toggleRowSelection(val.pop())
                }
                this.checkData = val;
        console.log(val);
            },
            //生成报检单按钮
            addReportBtn() {
@@ -530,6 +526,8 @@
      },
            //生成报检单确认按钮
            confirmBtn(formName) {
        this.$refs[formName].validate((valid=>{
          if(valid){
                let dateArr = this.addInspectionForm.inspectionDate;
                //添加报检单
                let val = this.checkData[0];
@@ -552,6 +550,8 @@
                this.addReportDialog = false;
                this.initNewSelection();
                this.showNewPage = true;
          }
        }));
            },
            //生成报检单
            async createReport(param) {
@@ -595,21 +595,6 @@
                    date: ''
                }
                this.getRawMaterialList()
            },
            radioclick() {
                console.log(this.inspectionTable);
                if (this.radioValue === 0) {

                }
            },
            getAllTableData() {
                this.getRawMaterialList()
            },
            getCheckData() {

            },
            getUnCheckData() {

            },
            // 每页条数改变时触发 选择一页显示多少行
            handleSizeChange(val) {
@@ -707,10 +692,15 @@
            flex-direction: column;

            .table-header {
        width: 100%;
        height: 70px;
                padding: 20px;
                display: flex;
                justify-content: space-between;

        .generateInsp{
          position: relative;
          left: 92%;
        }
                .el-form-item {
                    margin-bottom: 30px !important;
                }