Merge remote-tracking branch 'origin/master'

86134

2023-11-09 2e2cc56d419ce972d37c8f24b72090c5183b67e7

Merge remote-tracking branch 'origin/master'

 src/views/quality/finishedProductInspection/finishedProduct-form.vue

@@ -13,7 +13,7 @@
    </div>
    <div class="page-main">
        <div class="finishedProduct-basic">
            <el-form :model="processInspectVo" ref="addInspectionform" class="l-mes" 
            <el-form :model="processInspectVo" ref="addInspectionform" class="l-mes"
            label-position="right" label-width="120px" style="width: 100%" size="small">
                <div class="formwrapper">
                    <el-row>
@@ -86,7 +86,7 @@
            <el-row style="width:100%;">
                <el-col :span="24">
                    <el-table border :data="inspectionItems" height="400"
                        :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}" 
                        :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
                        :cell-style="{textAlign:'center'}" row-key="iid" default-expand-all
                        style="width: 100%" ref="table" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
                        <el-table-column type="index" label="序号" width="60"></el-table-column>
@@ -96,10 +96,10 @@
                        <el-table-column prop="required" label="标准值" width="240" ></el-table-column>
                        <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="检测值"
                            width="240" style="text-align: center;">
                            

                            <template slot-scope="scope">
                                <el-col v-if="scope.row.itype === '1'">
                                    <el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null" 
                                    <el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null"
                                        class="item" effect="dark" content="请先选择设备！"
                                            placement="top-start">
                                            <el-input :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]"
@@ -126,9 +126,9 @@
                                <span v-if="resultVal!=null && processInspectVo.id!=null" v-text="scope.row.ename"></span>
                                <div v-else>
                                    <el-input  v-model="scope.row.eId"  v-if="scope.row.iname != null" placeholder="请输入设备号"></el-input>
                                    <!-- <el-select style="width:100%" v-model="scope.row.eId" 
                                    <!-- <el-select style="width:100%" v-model="scope.row.eId"
                                    v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row,scope.$index)">
                                        <el-option v-for="(item,index) in deviceList" 
                                        <el-option v-for="(item,index) in deviceList"
                                        :key="index" :value="item.id" :label="item.number +'-'+ item.name"></el-option>
                                    </el-select> -->
                                </div>
@@ -184,7 +184,7 @@
            <el-row style="width:100%;">
                <el-col :span="24">
                    <el-table border height="90" :data="inspectionResultForm"
                    :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}" 
                    :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
                    :cell-style="{textAlign:'center'}">
                        <el-table-column prop="materialCode" label="物料编号"></el-table-column>
                        <el-table-column prop="material" label="物料名称"></el-table-column>
@@ -209,7 +209,7 @@
</template>

<script>
import { 
import {
    chooseMater,
    addFinish,
    queryById,
@@ -273,7 +273,7 @@
        this.init()
    },
    methods: {
        

        submitSave(){
            let pro = 0
            this.inspectionItems.forEach(item => {
@@ -582,4 +582,4 @@
  border-top: 0 !important;
  cursor: pointer !important;
}
</style>
</style>

 src/views/quality/finishedProductInspection/index.vue

@@ -196,6 +196,10 @@
        },
        created() { },
        methods: {
            //查看报告按钮
            showPrint(){
                
            },
            //打印按钮
            printFun() {
            this.printDialogVisible = false;

 src/views/quality/rawMaterial/index.vue

@@ -255,6 +255,7 @@
        //查看报告按钮
        previewFun(row){
            getObj(row.id).then(res=>{
                console.log(res);
                this.printFormData = res.data.data
                this.printDialogVisible = true
            }).catch(error=>{