Merge remote-tracking branch 'origin/master'

zss

2023-12-09 2aae6733da1982cf560bf5bbf8c8a102ca3feee3

Merge remote-tracking branch 'origin/master'

 src/api/quality/finishedDelivery.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
import request from '@/router/axios'

export function fetchList(query) {
  return request({
    url: '/mes/finishedIncome/page',
    method: 'get',
    params: query
  })
}

 src/api/quality/finishedProduct.js

@@ -77,4 +77,12 @@
    responseType : 'blob',
    params: query
  })
}

export function updateLocationIdById(obj) {
  return request({
    url: '/mes/qualityFinishedInspect/'+obj.id,
    method: 'post',
    params: obj
  })
}

 src/views/accounting/unitworkfactor/index.vue

@@ -36,7 +36,6 @@
import QuotaForm from '@/views/accounting/unitworkfactor/updateQuota-form.vue'
import { mapGetters } from 'vuex'
import ttable from '@/views/common/ztt-table.vue'
import { remote } from '../../../api/admin/dict'

export default {
  data() {

 src/views/quality/Packaging_ledger/pack-fromadd.vue

@@ -123,7 +123,6 @@
    },
    watch: {
      currshowlist() {
        console.log(22211);
        this.innerVisible = this.currshowlist
      }
    },
@@ -136,7 +135,7 @@
    methods: {
         // èŽ·å–数据列表
        getData() {
        this.$refs.paramTable.getDataList()
          this.$refs.paramTable.getDataList()
        },
        handleSelectionChange(val){
            let data = val
@@ -144,22 +143,8 @@
                this.datalistid = el
            });
        },
      saveSelectRow() {
        console.log(this.packageBoxIddata,"123");
        // saveList ({customerId:this.datalistid.id,contractNo:this.datalistid.contractNo}).then((res =>{
        //     console.log(res);
        //     if (res.status === 200) {
        //         this.$message.success('新增成功')
        //     }else{
        //         this.$message.error('创建失败')
        //     }
        // }))
        this.innerVisible = false
        //   this.$emit('handleSelectionChange',this.innerVisible )
      },
      handleSelectionChange(val){
        this.datalist = val
        console.log(this.datalist,"数据");
      },
      saveSelectRow(){
        this.$emit('handleSelectionChange',this.datalist )

 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" :rules="processInspectRules" ref="addInspectionform" class="l-mes"
            label-position="right" label-width="120px" style="width: 100%"  size="small">
                <div class="formwrapper">
                    <el-row>
@@ -79,6 +79,21 @@
                                    autocomplete="off" :disabled="processInspectVo.id != null" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="6" v-if="processInspectVo.id != null">
                            <el-form-item label="批次号：">
                                <el-input v-model="processInspectVo.outBatchNo" autocomplete="off" disabled />
                            </el-form-item>
                        </el-col>
                        <el-col :span="6" v-if="processInspectVo.id != null">
                            <el-form-item label="产品合格库位：" prop="locationId">
                                <el-select @change="changeLocation" clearable style="width:100%" 
                                v-model="processInspectVo.locationId" placeholder="请选择合格库位"
                                    autocomplete="off">
                                    <el-option v-for="(item,i) in locationList" :key="i" 
                                    :label="item.locName+'-'+item.locNo" :value="item.id"></el-option>
                                </el-select>
                            </el-form-item>
                        </el-col>
                    </el-row>
                </div>
            </el-form>
@@ -104,21 +119,20 @@
                        <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"
                                        class="item" effect="dark" content="请先选择设备！"
                                            placement="top-start">
                                            <el-input :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]"
                                                @blur="changeState(scope.row, index)" placeholder="请输入检测值"></el-input>
                                                @blur="changeState(scope.row)" placeholder="请输入检测值"></el-input>
                                            <span v-if="resultVal != null" v-text="scope.row.empiricalValueAddss[index]"></span>
                                    </el-tooltip>
                                </el-col>
                                <el-col v-else>
                                        <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
                                            class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                            <el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="请选择">
                                            <el-select style="width: 100%;" @change="changeState(scope.row)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="请选择">
                                                <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
                                                    :value="item.value">
                                                </el-option>
@@ -133,16 +147,15 @@
                            <template slot-scope="scope">
                                <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"
                                    v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row,scope.$index)">
                                    v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row)">
                                        <el-option v-for="(item,index) in deviceList"
                                        :key="index" :value="item.id" :label="item.number +'-'+ item.name"></el-option>
                                        :key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
                                    </el-select>
                                </div>
                            </template>
                        </el-table-column>
                        <el-table-column prop="inspectionValue"  :key="index"
                        <el-table-column prop="inspectionValue">
                                label="检验描述" width="240" style="text-align: center;">
                                <template slot-scope="scope">
                                    <el-col v-if="scope.row.itype === '1'">
@@ -151,7 +164,7 @@

                                            <el-input :disabled="scope.row.eId == null"
                                                v-model="scope.row.inote"
                                                @blur="changeState(scope.row, index)" placeholder="请输入检验描述"></el-input>
                                                @blur="changeState(scope.row)" placeholder="请输入检验描述"></el-input>

                                            <span v-if="resultVal != null && processInspectVo.id != null"
                                                v-text="scope.row.inote"></span>
@@ -162,12 +175,7 @@
                                            class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                            <el-input :disabled="scope.row.eId == null"
                                                v-model="scope.row.inote"
                                                @blur="changeState(scope.row, index)" placeholder="请输入检测值"></el-input>
                                            <!-- <el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.inote" placeholder="请选择">
                                                <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
                                                    :value="item.value">
                                                </el-option>
                                            </el-select> -->
                                                @blur="changeState(scope.row)" placeholder="请输入检测值"></el-input>
                                            <span v-if="resultVal != null && processInspectVo.id != null"
                                                v-text="scope.row.inote"></span>
                                        </el-tooltip>
@@ -227,11 +235,14 @@
    updateFinishedInsProduct,
    updateFinishedInspectById,
    selectDeviceAPI,
    updateLocationIdById,
 } from '@/api/quality/finishedProduct'
import { selectDevice } from '@/api/quality/rawMaterial'
 import { getIfsLocationByGroupCopyAll } from '@/api/warehouse/location'
 import { remote } from '@/api/admin/dict'
export default {
    data() {
        return {
            locationList: [],
            dataVal: [{
                label: '是',
                value: '是'
@@ -247,6 +258,9 @@
            empiricalValueAdd: 1,
            // ç¼–辑时存储最长的列数字，做删除判断
            empiricalValueAddMaxNumber: 0,
            processInspectRules: {
                locationId: [{required: true,message:'请选择库位号',trigger:'blur'}]
            },
            processInspectVo: {
                id: null,
                finInsNo: null,
@@ -260,7 +274,9 @@
                specificationsModel: null,
                unit: null,
                technologyId: null,
                documentId: null
                documentId: null,
                outBatchNo: null,
                locationId: null,
            },
            inspectionItems: [], // æ–°å¢žæ£€éªŒé¡¹ç›®è¡¨æ ¼
            inspectionResultForm: [],
@@ -283,11 +299,38 @@
            let val = sessionStorage.getItem("finished-resultVal-"+this.processInspectVo.id);
            val == undefined ? this.resultVal=null : this.resultVal = val
        }
        this.getIfsLocation()
        this.init()
    },
    methods: {
        
        changeLocation(val){
            if(val){
                let obj = {
                    id: this.processInspectVo.id,
                    locationId: val
                }
                updateLocationIdById(obj).then(res=>{
                    if(res.status===200){
                        this.$message.success("更新合格库位成功")
                    }
                })
            }
        },
        getIfsLocation(){
            getIfsLocationByGroupCopyAll({locationGroup: '1'}).then(res=>{
                if(res.status===200){
                    this.locationList = res.data.data
                }
            }).catch(error=>{
                console.error(error);
            })
        },
        submitSave(){
            let locationId = this.processInspectVo.locationId
            if(locationId==null){
                this.$message.error("请选择产品合格库位")
                return
            }
            let pro = 0
            this.inspectionItems.forEach(item => {
                if(item.children){
@@ -359,6 +402,8 @@
                    this.processInspectVo.unit = result.punit
                    this.processInspectVo.quantity = result.quantity
                    this.processInspectVo.documentId = result.documentId
                    this.processInspectVo.outBatchNo = result.outBatchNo
                    this.processInspectVo.locationId = result.locationId
                    let userList = []
                    result.children.forEach(item=>{
                        item.iid = Math.random()
@@ -395,15 +440,11 @@
        },
        getDeviceList(){
            selectDeviceAPI(null).then(res=>{
                // this.deviceList = res.data.data
                console.log(res);
                this.deviceList = res.data.data

            })
        },
        updateDevice(row,index){
        updateDevice(row){
            let rowId=JSON.stringify(row.iid)
            console.log(row);
            updateDeviceById({deviceId:row.eId,fpid:row.iid}).then(res=>{
                this.inspectionItems.forEach(obj=>{
                    obj.children.forEach(c=>{
@@ -414,14 +455,6 @@
                        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)
@@ -438,7 +471,7 @@
            this.processInspectVo.unit = sample.unit
            this.processInspectVo.documentId = sample.documentId
        },
        changeState(row, index) {
        changeState(row) {
            if (row.iid != null && row.iid != '') {
                let str = ""
                row.empiricalValueAddss.forEach(e => {

 src/views/quality/finishedProductInspection/index.vue

@@ -37,7 +37,7 @@
    import { transform } from '@/util/fileTransform'
    import printTemplate from './finishedProducter-print.vue'
    import PrintJS from 'print-js'
import { title } from 'process'
    import { title } from 'process'
    export default {
        components: {
            finishedProductInspectionAdd,

 src/views/warehouse/FinishedDelivery/index.vue

@@ -4,6 +4,7 @@
        <ttable
        :table="table"
        :isShowHide="true"
        :ajaxFun="ajaxFun"
        :prelang="prelang"
        :options="options" 
        ref="processconfiguration"
@@ -16,9 +17,12 @@

<script>
import ttable from '@/views/common/ztt-table.vue'
import { fetchList, } from '@/api/quality/finishedDelivery'

export default {
    data(){
        return {
            ajaxFun: fetchList,
            prelang: 'operation',
            dataListLoading: false,
            options: {
@@ -44,22 +48,30 @@
                column: [
                  {
                    minWidth: '140',
                    prop: 'oo',
                    label: '订单编号',
                    prop: 'packageNo',
                    label: '包装编号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },{
                    minWidth: '140',
                    prop: 'materhhooial',
                    label: '质量追溯号',
                    prop: 'outBatchNo',
                    label: '批次号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'mateuurial',
                    prop: 'partNo',
                    label: '产品编号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'partName',
                    label: '产品名称',
                    isTrue: true,
                    isSearch: true,
@@ -67,7 +79,7 @@
                  },
                  {
                    minWidth: '140',
                    prop: 'materoiial',
                    prop: 'specs',
                    label: '规格型号',
                    isTrue: true,
                    isSearch: true,
@@ -75,7 +87,7 @@
                  },
                  {
                    minWidth: '140',
                    prop: 'matperoial',
                    prop: 'unit',
                    label: '单位',
                    isTrue: true,
                    isSearch: true,
@@ -83,7 +95,7 @@
                  },
                  {
                    minWidth: '140',
                    prop: 'materpial',
                    prop: 'number',
                    label: '数量',
                    isTrue: true,
                    isSearch: true,
@@ -91,34 +103,40 @@
                  },
                  {
                    minWidth: '130',
                    width: '150',
                    prop: 'dealTime',
                    prop: 'createTime',
                    label: '入库时间',
                    sort: true,
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'datetimerange',
                    // formatter: this.formatDateTime,
                },
                ],
                toolbar: [
                    formatter: this.formatDateTime,
                  },
                  {
                    text: 'xxx',
                    type: 'primary',
                    // fun: this.addOrUpdateHandle
                    minWidth: '130',
                    prop: 'createUser',
                    label: '创建人',
                    sort: true,
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                ],
                toolbar: [],
                // operator: [],
                // operatorConfig: {}
            },
       }
    },
    medthods: {},
//     computed: {
//     ...mapGetters(['permissions'])
//   },
    // computed: {
    //   ...mapGetters(['permissions'])
    // },
    components: {
    ttable
      ttable
    },
    medthods: {
      formatDateTime(row, column, cellValue) {
          return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
      },
    },
}
</script>

 src/views/warehouse/FinishedWarehousing/index.vue

@@ -121,13 +121,7 @@
                    searchInfoType: 'text',
                },
                ],
                toolbar: [
                  {
                    text: 'xx',
                    type: 'primary',
                    // fun: this.addOrUpdateHandle
                  },
                ],
                toolbar: [],
                // operator: [],
                // operatorConfig: {}
            },