Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

duhe

4 天以前 f0b9032cf520f28e4ddb1ad027d9279369955a6d

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

 src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue

@@ -175,6 +175,7 @@
                    <el-button size="mini" @click="get_PrintReport">打印</el-button>
                    <el-button size="mini" @click="get_Refresh">刷新</el-button>
                    <el-button size="mini" @click="get_BarCodeDetail">条码明细</el-button>
                    <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_PackStockDetail">包装容器出入库明细</el-button>
                </el-col>
            </el-row>

@@ -210,7 +211,7 @@
            :visible.sync="barcodeDetailVisible"
            ref="barcodeDetail"
            />

        <PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail"/>
        
    </div>
</template>
@@ -221,23 +222,23 @@
import FbStepFoldinBillEdit from '@/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit'
import BarCodeDetail from '@/views/component/BarCodeDetail'
import dayjs from 'dayjs';

import PackStockDetail from '@/views/component/PackStockDetail'

export default {
    name: 'FbStepFoldinBillList',
        components: {
            FbStepFoldinBillEdit,
            BarCodeDetail
            BarCodeDetail,PackStockDetail
            
        },
    data() {
        return {

            rowForm: {},
            editDialogVisible:false,
            operationType:'1',
            currentId : '',
              barcodeDetailVisible: false,// 条码明细弹窗显示控制

            packStockDetailShow:false, 
            query: {
                HInitTimeCycle: 29,
                HBeginDate: '',
@@ -670,6 +671,10 @@
        },
        onSelectionChange(selection) {
            this.selectedRows = selection;
            this.ids = selection.map(item => item.hmainid)
            console.log('选择的行:', selection,"选择的ids:",this.ids);
            if (selection.length > 0)
            this.rowForm = selection[0]
        },
        onBillNoClick(row) {
            const table = this.$refs.mainTable;
@@ -691,11 +696,24 @@
            this.$message.warning('请选择一行数据查看条码明细！')
            return
        }
		
        this.barcodeDetailVisible = true
        this.$nextTick(() => {
            this.$refs.barcodeDetail.open(this.selectedRows[0])
        })
        },
         //#region 包装容器出入库明细
            get_PackStockDetail() {
      // if (this.selectedRow.length !== 1) {
      //   this.$message.warning('请选择一行数据查看条码明细！')
      //   return
      // }
            this.packStockDetailShow = true
            this.$nextTick(() => {
                this.$refs.packStockDetail.open(this.rowForm)
            })
        },
    //#endregion
        get_ViewReport() {
            if (this.selectedRows.length !== 1) { 
                this.$message.warning('请选择一行数据打印！'); 

 src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue

@@ -175,7 +175,9 @@
                    <el-button size="mini" @click="get_PrintReport">打印</el-button>
                    <el-button size="mini" @click="get_Refresh">刷新</el-button>
                    <el-button size="mini" @click="get_BarCodeDetail">条码明细</el-button>
                    <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_PackStockDetail">包装容器出入库明细</el-button>
                </el-col>
				
            </el-row>

            <el-table
@@ -184,11 +186,11 @@
                border
                style="width:100%"
                @row-click="onRowClick"
                @selection-change="onSelectionChange"
                @selection-change="onSelectionChange"	
                :loading="loading"
                ref="mainTable"
            >
                <el-table-column type="selection" width="55" />
                <el-table-column type="selection" width="55"  />
                <el-table-column v-for="(col, idx) in tableColumns" :key="idx" :prop="col.field" :label="col.title" :width="col.width" :formatter="col.formatter">
                    <template v-if="col.field === '单据号'" #default="scope">
                        <span style="color: blue; cursor: pointer;" @click="onBillNoClick(scope.row)">{{ scope.row.单据号 }}</span>
@@ -210,6 +212,8 @@
            :visible.sync="barcodeDetailVisible"
            ref="barcodeDetail"
            />
               <!-- 包装容器出入库明细 -->
      <PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail"/>
    </div>
</template>

@@ -218,21 +222,23 @@
//import FbStepFoldinBillEdit from './fbStepFoldinBillEdit'
import FbStepFoldinBillEdit from '@/views/FbStepFoldinBillList/fbStepFoldinBillListEdit'
import BarCodeDetail from '@/views/component/BarCodeDetail'

import PackStockDetail from '@/views/component/PackStockDetail' 

export default {
    name: 'FbStepFoldinBillList',
        components: {
            FbStepFoldinBillEdit,
            BarCodeDetail
            BarCodeDetail,
            PackStockDetail
        },
    data() {
        return {
            rowForm: {},
            editDialogVisible:false,
            operationType:'1',
            currentId : '',
              barcodeDetailVisible: false,// 条码明细弹窗显示控制

            packStockDetailShow:false,                            //包装容器出入库明细容器显示标记
            query: {
                HInitTimeCycle: 29,
                HBeginDate: '',
@@ -293,7 +299,7 @@
            this.set_InitGrid();
            this.ColFilter();
            this.get_DefaultModule();
        },
        }, 
        setSelect_HInitTimeCycle() {
            this.query.HInitTimeCycle = 29;
        },
@@ -666,6 +672,11 @@
        },
        onSelectionChange(selection) {
            this.selectedRows = selection;
            this.ids = selection.map(item => item.hmainid)
            console.log('选择的行:', selection,"选择的ids:",this.ids);
            if (selection.length > 0)
            this.rowForm = selection[0]
      
        },
        onBillNoClick(row) {
            const table = this.$refs.mainTable;
@@ -708,6 +719,18 @@
            const hmainid = this.selectedRows.map(r => (r.hmainid * (10 ** 8)) + (r.hsubid || 0)).toString();
            window.open('../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainid + '&MyMsg=' + hmainid + '&Type=HSeOutStockBillList', '_blank');
        },
         //#region 包装容器出入库明细
            get_PackStockDetail() {
      // if (this.selectedRow.length !== 1) {
      //   this.$message.warning('请选择一行数据查看条码明细！')
      //   return
      // }
            this.packStockDetailShow = true
            this.$nextTick(() => {
                this.$refs.packStockDetail.open(this.rowForm)
            })
        },
    //#endregion
        get_Refresh() {
            this.onReset();
        },

 src/views/scMould/basicModeling/Gy_MouldFile.vue

@@ -992,6 +992,7 @@
        HDeleteDate: '',
        HInComDate: moment(new Date()).format('YYYY-MM-DD'),
        DateTime: moment(new Date()).format('YYYY-MM-DD'),
        HCalibrationDate: moment(new Date()).format('YYYY-MM-DD'),
      }
      this.editData = []
      this.editBtData = []
@@ -1065,6 +1066,7 @@
      axios.get(this.baseURL + "/Gy_Mould_Edit/xg", {
        params: { 'HInterID': rowHmainid }
      }).then(response => {
        console.log(response.data)
        if (response.data.count == 1) {
          var result = response.data
          var data = response.data.data[0]
@@ -1137,12 +1139,16 @@
          this.form.HMouldUseStatus = data.模具可用状态
          this.form.HNextMainDate = data.校正日期
          this.form.HUSEORGID = data.HUSEORGID
          this.form.HMouldLength = data.HMouldLength
          this.form.HMouldWidth = data.HMouldWidth
          this.form.HMouldHeight = data.HMouldHeight
          this.form.HMouldFoldHeight = data.HMouldFoldHeight
          // this.form.HMouldLength = data.HMouldLength
          // this.form.HMouldWidth = data.HMouldWidth
          // this.form.HMouldHeight = data.HMouldHeight
          // this.form.HMouldFoldHeight = data.HMouldFoldHeight
          this.form.HTransPackFlag = data.HTransPackFlag == 0 ? false : true
          this.form.HSendPackFlag = data.HSendPackFlag == 0 ? false : true
          this.form.HMouldFoldHeight = data.折叠高度
            this.form.HMouldLength = data.长
          this.form.HMouldWidth = data.宽
          this.form.HMouldHeight = data.高
          for (var i = 0; i < result.data.length; i++) {
            this.editData.push(
              {