返工返修

10 months ago · bad1e31e6c
4 changed files with 136 additions and 49 deletions
--- a/src/components/SmartTable.vue
+++ b/src/components/SmartTable.vue
@ -0,0 +1,52 @@
 <template>
  <el-table v-bind="$attrs" v-on="$listeners">
    <!--  默认插槽用于自定义的一些参数  -->
    <slot></slot>
    <el-table-column
      v-for="(col, index) in columns"
      :key="index"
      v-bind="col"
    >
      <template slot-scope="{ row, $index }">
        <!-- 优先使用插槽 -->
        <slot
          v-if="col.slot"
          :name="col.prop"
          :row="row"
          :index="$index"
        ></slot>
        <!-- 渲染函数处理 -->
        <template v-else-if="col.formatter">
          <render-cell :render="col.formatter" :row="row" :index="$index" />
        </template>
        <!-- 默认显示 -->
        <span v-else>{{ row[col.prop] }}</span>
      </template>
    </el-table-column>
  </el-table>
 </template>
 <script>
 // 函数式组件处理渲染函数
 const RenderCell = {
  functional: true,
  props: {
    render: Function,
    row: Object,
    index: Number
  },
  render(h, ctx) {
    return ctx.props.render(h, ctx.props.row, ctx.props.index)
  }
 }
 export default {
  name: 'SmartTable',
  components: { RenderCell },
  props: {
    columns: { type: Array, required: true }
  }
 }
 </script>
--- a/src/views/modules/production/bagLabels.vue
+++ b/src/views/modules/production/bagLabels.vue
@ -129,6 +129,10 @@ export default {
      })
    },
    printLabel() {
      if (!this.searchData.seqNo){
        this.$message.warning("请先扫描派工单号");
        return;
      }
      if (!this.soScheduleRouting.site) {
        this.$message.warning("请先扫描派工单号")
        return
@ -140,7 +144,8 @@ export default {
      let params = {
        previousSeqNo: this.soScheduleRouting.previousSeqNo,
        site: this.soScheduleRouting.site,
        orderNo: this.soScheduleRouting.orderNo
        orderNo: this.soScheduleRouting.orderNo,
        seqNo:this.searchData.seqNo
      }
      if (this.searchData.flag === 'Y') {
        this.flag = true;
@ -242,7 +247,7 @@ export default {
                         v-model="searchData.seqNo" @keyup.enter.native="selectBySeqNo"></el-input-number>
      </el-form-item>
      <el-form-item label=" ">
        <el-select v-model="searchData.flag" clearable>
        <el-select v-model="searchData.flag">
          <el-option value="" label="标准袋数"></el-option>
          <el-option value="Y" label="零数袋"></el-option>
        </el-select>
--- a/src/views/modules/production/bagLabelsTCP.vue
+++ b/src/views/modules/production/bagLabelsTCP.vue
@ -172,6 +172,7 @@ export default {
        previousSeqNo: this.soScheduleRouting.previousSeqNo,
        site: this.soScheduleRouting.site,
        orderNo: this.soScheduleRouting.orderNo,
        seqNo:this.searchData.seqNo
      }
      if (!params) {
        return
--- a/src/views/modules/production/liuhuaProductView.vue
+++ b/src/views/modules/production/liuhuaProductView.vue
@ -1,52 +1,80 @@
 <template>
  <div class="mod-config">
    <el-form :inline="true"  label-position="top" label-width="100px" >
      <el-form-item :label="'工厂编码'">
        <el-input v-model="searchData.site" style="width: 130px"></el-input>
      </el-form-item>
      <el-form-item :label="'生产订单号'">
        <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
      </el-form-item>
      <el-form-item :label="'派工单号'">
        <el-input v-model="searchData.seqNo" type="number" style="width: 130px"></el-input>
      </el-form-item>
      <el-form-item :label="'操作员姓名'">
        <el-input v-model="searchData.operatorDesc" style="width: 130px"></el-input>
      </el-form-item>
      <el-form-item >
        <span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span>
        <el-input v-model="searchData.partNo" style="width: 120px"></el-input>
      </el-form-item>
      <el-form-item :label="'规格型号'">
        <el-input v-model="searchData.partSpec" style="width: 120px"></el-input>
      </el-form-item>
      <el-form-item :label="'派工日期：'">
        <el-date-picker
          style="width: 130px"
          v-model="searchData.startDate"
          value-format="yyyy-MM-dd"
          placeholder="选择日期">
        </el-date-picker>
      </el-form-item>
      <el-form-item :label="'到：'">
        <el-date-picker
          style="width: 130px"
          v-model="searchData.endDate"
          value-format="yyyy-MM-dd"
          placeholder="选择日期">
        </el-date-picker>
        <el-button @click="search()" type="primary">查询</el-button>
        <download-excel
          :fields="fields()"
          type="xls"
          :name="exportName"
          :fetch="createExportData"
          worksheet="导出信息"
          class="el-button el-button--primary el-button--medium">
          {{ '导出' }}
        </download-excel>
      </el-form-item>
    <el-form :model="searchData" label-position="top" label-width="100px" style="width: 1800px;">
      <el-row :gutter="10">
        <el-col :span="2">
          <el-form-item :label="'工厂编码'">
            <el-input v-model="searchData.site" clearable></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="2">
          <el-form-item :label="'生产订单号'">
            <el-input v-model="searchData.orderNo" clearable></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="2">
          <el-form-item :label="'派工单号'">
            <el-input v-model="searchData.seqNo" type="number"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="2">
          <el-form-item :label="'操作员姓名'">
            <el-input v-model="searchData.operatorDesc"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="2">
          <el-form-item >
            <span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span>
            <el-input v-model="searchData.partNo"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="2">
          <el-form-item :label="'规格型号'">
            <el-input v-model="searchData.partSpec" ></el-input>
          </el-form-item>
        </el-col>
 <!--      </el-row>-->
 <!--      <el-row :gutter="10">-->
        <el-col :span="2">
          <el-form-item :label="'派工日期：'">
            <el-date-picker
              style="width: 100%"
              v-model="searchData.startDate"
              value-format="yyyy-MM-dd"
              placeholder="选择日期">
            </el-date-picker>
          </el-form-item>
        </el-col>
        <el-col :span="2">
          <el-form-item :label="'到：'">
            <el-date-picker
              style="width: 100%"
              v-model="searchData.endDate"
              value-format="yyyy-MM-dd"
              placeholder="选择日期">
            </el-date-picker>
          </el-form-item>
        </el-col>
 <!--        <el-col :span="4">-->
 <!--          <el-form-item label=" ">-->
 <!--            <el-checkbox v-model="searchData.firstReportDate2Flag" true-label="Y" false-label="N">仅显示首次报工日期小于今天</el-checkbox>-->
 <!--          </el-form-item>-->
 <!--        </el-col>-->
        <el-col :span="2">
          <el-form-item label=" ">
            <el-button @click="search()" type="primary">查询</el-button>
            <download-excel
              :fields="fields()"
              type="xls"
              :name="exportName"
              :fetch="createExportData"
              worksheet="导出信息"
              class="el-button el-button--primary el-button--medium">
              {{ '导出' }}
            </download-excel>
          </el-form-item>
        </el-col>
      </el-row>
    </el-form>
    <el-table
@ -480,6 +508,7 @@
          partSpec:'',
          startDate:'',
          endDate:'',
          firstReportDate2Flag:'N',
          seqNo:'',
        },
      }