s

王震

2023-11-10 26bbf3648b29c0f855b53b3ee44c3d66b11818b2

s

 src/views/plan/customer/index.vue

@@ -242,6 +242,7 @@
    },
    handleSelectionChange(val) {
      this.multipleSelection = val
      console.log(this.multipleSelection);
    },
    // 删除
    deleteHandle(row) {

 src/views/plan/customerorder/index.vue

@@ -975,6 +975,7 @@
    // 创建主生产计划
    masterPlanHandle() {
      console.log(this.multipleSelection);

      if (this.multipleSelection && this.multipleSelection.length > 0) {
        if (this.judgeCoState(this.multipleSelection)) {
          // 判断一下剩余数量是否大于0

 src/views/plan/customerorder/schedule-table.vue

@@ -222,11 +222,13 @@
        this.dataForm.customer = []
        const _that = this
        customer.forEach((item) => {
          console.log(item);
          const outPutBatchList = []
          _that.$set(item, 'outPutBatchList', outPutBatchList)
          customerList.push(item)
        })
        this.dataForm.customer = JSON.parse(JSON.stringify(customerList))
        console.log(this.dataForm.customer);
      })
    },
    dataFormSubmit() {

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

@@ -8,7 +8,7 @@
            <h2 v-else>编辑-产品检验单</h2>
        </div>
        <div class="btn-group header-right">
            <el-button @click="addTestProject" type="primary" v-if="processInspectVo.id==null">生成检验项目</el-button>
            <el-button @click="addTestProject" v-if="processInspectVo.id==null">生成检验项目</el-button>
        </div>
    </div>
    <div class="page-main">
@@ -134,7 +134,7 @@
                                </div>
                            </template>
                        </el-table-column>
                        <el-table-column prop="inspectionValue" :key="index"
                        <el-table-column prop="inspectionValue"  :key="index"
                                label="检验描述" width="240" style="text-align: center;">
                                <template slot-scope="scope">
                                    <el-col v-if="scope.row.itype === '1'">
@@ -276,7 +276,7 @@
        this.init()
    },
    methods: {

        
        submitSave(){
            let pro = 0
            this.inspectionItems.forEach(item => {
@@ -390,15 +390,26 @@
            })
        },
        updateDevice(row,index){
            updateDeviceById({deviceId:row.eId,fpid:row.iId}).then(res=>{
            let rowId=JSON.stringify(row.iid)
            console.log(row);
            updateDeviceById({deviceId:row.eId,fpid:row.iid}).then(res=>{
                this.inspectionItems.forEach(obj=>{
                    if(obj.children){
                        obj.children[index-1].inspectionValue = ''
                        obj.children[index-1].iresult = null
                        obj.children[index-1].empiricalValueAddss = []
                        obj.children[index-1].inote=''
                    obj.children.forEach(c=>{
                        if(c.iid==rowId){
                        c.inspectionValue = null
                        c.iresult = null
                        c.empiricalValueAddss = []
                        c.inote=''
                        }
                    })

                    }
                    // if(obj.children){
                    //     obj.children[index-1].inspectionValue = ''
                    //     obj.children[index-1].iresult = null
                    //     obj.children[index-1].empiricalValueAddss = []
                    //     obj.children[index-1].inote=''

                    // }
                })
            }).catch(error=>{
                console.log(error)

 src/views/quality/finishedProductInspection/index.vue

@@ -16,7 +16,7 @@
            top="10vh"
            title="打印预览"
            :visible.sync="printDialogVisible"
            width="65%">
            width="70%">
            <div style="width:100%;height: 60vh;overflow-y: scroll;">
                <printTemplate id="printRaw" :formData="printFormData"></printTemplate>
            </div>
@@ -35,7 +35,7 @@
    import finishedProductInspectionAdd from './finishedProduct-form'
    import { page,deletePro,exportExaminationProducts,queryById } from '@/api/quality/finishedProduct'
    import { transform } from '@/util/fileTransform'
    import printTemplate from './finishedProduct-print.vue'
    import printTemplate from './finishedProducter-print.vue'
    import PrintJS from 'print-js'
    export default {
        components: {
@@ -210,17 +210,7 @@
        }
    },
        methods: {
            //查看报告按钮
            // showPrint(row){
            //     queryById(row.id).then(res=>{
            //     console.log(res);
            //     this.printFormData = res.data.data
            //     this.printDialogVisible = true
            // })
            // .catch(error=>{
            //     console.log(error);
            // })
            // },
            
            //打印按钮
            printFun() {
            this.printDialogVisible = false;
@@ -234,7 +224,9 @@
                    orientation: 'portrait'
                });
            },
            //查看报告按钮
            showPrint(row){
                console.log('----------');
                queryById(row.id).then(res=>{
                    this.printFormData = res.data.data
                    this.printDialogVisible = true

 src/views/quality/rawMaterial/rawMaterial-form.vue

@@ -572,6 +572,7 @@
                      }
                      ele.children.push(o)
                    })
                    console.log("----------",ele);
                    this.list.push(ele)
                }
            })         
@@ -635,6 +636,7 @@
            let val=''
            arr.forEach(a=>{
              val+=a+","
              // val += '"' + a + "," 
            })
            let end=val.substring(0,val.length-1)
            c.testValue=end