小小儁爺
2024-08-08 e3d5394e07c6e7dc24cf620bd16f07d78ff96e03
1.报表新增销售单号字段查询展示
已修改7个文件
176 ■■■■ 文件已修改
src/views/statistic/defectDetailList.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/statistic/groupSalaryList.vue 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/statistic/personSalaryList.vue 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/statistic/repairDetailList.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/statistic/subcontractingOperation.vue 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/statistic/workOrderProcess.vue 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/statistic/defectDetailList.vue
@@ -14,6 +14,9 @@
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="销售单号" style="display: flex;">
              <el-input v-model="form.socode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="车间名称" style=" display: flex;">
              <el-select
                v-model="form.wkshopcode"
@@ -36,7 +39,7 @@
            <el-form-item label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品名称" style=" display: flex;">
            <el-form-item label="产品名称" v-show="isExpandForm" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="规格型号" style=" display: flex;">
@@ -121,6 +124,12 @@
          <el-table-column
            prop="wo_code"
            label="工单编号"
            width="160"
            sortable="custom"
          />
          <el-table-column
            prop="socode"
            label="销售单号"
            width="160"
            sortable="custom"
          />
@@ -302,6 +311,7 @@
      mainHeight: 0,
      tableHeight: 0,
      form: {
        socode:'',
        wkshopcode: '',
        wocode: '', // 工单编号
        partcode: '', // 产品编码
@@ -381,6 +391,7 @@
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        socode:this.form.socode,
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
@@ -428,6 +439,7 @@
      }
      const data = {
        socode:this.form.socode,
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
@@ -457,6 +469,7 @@
    },
    // 重置
    reset() {
      this.form.socode=''
      this.form.wkshopcode = ''
      this.form.wocode = ''
      this.form.partcode = ''
src/views/statistic/groupSalaryList.vue
@@ -40,6 +40,9 @@
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="销售单号" style="display: flex;">
              <el-input v-model="form.socode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="车间名称" style=" display: flex;">
              <el-select
                v-model="form.wkshopcode"
@@ -62,7 +65,7 @@
            <el-form-item label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品名称" style=" display: flex;">
            <el-form-item label="产品名称"  v-show="isExpandForm" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <!--            <el-form-item label="规格型号" style=" display: flex;">-->
@@ -81,9 +84,9 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="操作人员" style=" display: flex;">
              <el-input v-model="form.username" style="width: 200px" placeholder="请输入" />
            </el-form-item>
<!--            <el-form-item v-show="isExpandForm" label="操作人员" style=" display: flex;">-->
<!--              <el-input v-model="form.username" style="width: 200px" placeholder="请输入" />-->
<!--            </el-form-item>-->
            <el-form-item v-show="isExpandForm" label="操作时间" style="display: flex;align-items: center">
              <el-date-picker
                v-model="form.operdate"
@@ -156,6 +159,12 @@
              <el-table-column
                prop="wo_code"
                label="工单编号"
                width="160"
                sortable="custom"
              />
              <el-table-column
                prop="socode"
                label="销售单号"
                width="160"
                sortable="custom"
              />
@@ -328,6 +337,13 @@
                prop="wo_code"
                label="工单编号"
                width="160"
                sortable="custom"
              />
              <el-table-column
                prop="socode"
                label="销售编号"
                width="160"
                show-tooltip-when-overflow
                sortable="custom"
              />
              <el-table-column
@@ -546,6 +562,7 @@
      tableHeight: 0,
      StepSelectArr: [], // 剔除工序数组
      form: {
        socode:'' ,
        wkshopcode: '',
        wocode: '', // 工单编号
        partcode: '', // 产品编码
@@ -672,6 +689,7 @@
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        socode:this.form.socode,
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
@@ -731,6 +749,7 @@
      }
      const data = {
        socode: this.form.socode,
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
@@ -760,6 +779,7 @@
    },
    // 重置
    reset() {
      this.form.socode=''
      this.form.wkshopcode = ''
      this.form.wocode = ''
      this.form.partcode = ''
src/views/statistic/personSalaryList.vue
@@ -40,6 +40,9 @@
          style="display: flex; "
        >
          <div class="elForm">
            <el-form-item label="销售单号" style="display: flex;">
              <el-input v-model="form.socode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="车间名称" style=" display: flex;">
              <el-select
                v-model="form.wkshopcode"
@@ -60,15 +63,15 @@
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
              <el-input v-model="form.partcode"  placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品名称" style=" display: flex;">
            <el-form-item label="产品名称" v-show="isExpandForm" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="规格型号" style=" display: flex;">
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="工序名称" style=" display: flex;">
            <el-form-item v-show="isExpandForm"  label="工序名称" style=" display: flex;">
              <el-input v-model="form.stepname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <!--            <el-form-item v-show="isExpandForm" label="生产班组" style=" display: flex;">-->
@@ -81,9 +84,9 @@
            <!--                />-->
            <!--              </el-select>-->
            <!--            </el-form-item>-->
            <el-form-item v-show="isExpandForm" label="报工人员" style=" display: flex;">
              <el-input v-model="form.reportname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
<!--            <el-form-item v-show="isExpandForm" label="报工人员" style=" display: flex;">-->
<!--              <el-input v-model="form.reportname" style="width: 200px" placeholder="请输入" />-->
<!--            </el-form-item>-->
            <el-form-item v-show="isExpandForm" label="报工时间" style="display: flex;align-items: center">
              <el-date-picker
                v-model="form.reportdate"
@@ -156,6 +159,13 @@
                prop="wo_code"
                label="工单编号"
                width="160"
                sortable="custom"
              />
              <el-table-column
                prop="socode"
                label="销售编号"
                width="160"
                show-tooltip-when-overflow
                sortable="custom"
              />
              <el-table-column
@@ -322,6 +332,13 @@
                prop="wo_code"
                label="工单编号"
                width="160"
                sortable="custom"
              />
              <el-table-column
                prop="socode"
                label="销售编号"
                width="160"
                show-tooltip-when-overflow
                sortable="custom"
              />
              <el-table-column
@@ -521,6 +538,7 @@
      tableHeight: 0,
      StepSelectArr: [], // 剔除工序数组
      form: {
        socode:'',
        wkshopcode: '',
        wocode: '', // 工单编号
        partcode: '', // 产品编码
@@ -656,6 +674,7 @@
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        socode: this.form.socode,
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
@@ -714,6 +733,7 @@
      }
      const data = {
        socode:this.form.socode,
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
@@ -743,6 +763,7 @@
    },
    // 重置
    reset() {
      this.form.socode=''
      this.form.wkshopcode = ''
      this.form.wocode = ''
      this.form.partcode = ''
src/views/statistic/repairDetailList.vue
@@ -14,6 +14,9 @@
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="销售单号" style="display: flex;">
              <el-input v-model="form.socode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="车间名称" style=" display: flex;">
              <el-select
                v-model="form.wkshopcode"
@@ -36,7 +39,7 @@
            <el-form-item label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品名称" style=" display: flex;">
            <el-form-item label="产品名称" v-show="isExpandForm" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="规格型号" style=" display: flex;">
@@ -129,6 +132,12 @@
          <el-table-column
            prop="wo_code"
            label="工单编号"
            width="160"
            sortable="custom"
          />
          <el-table-column
            prop="socode"
            label="销售单号"
            width="160"
            sortable="custom"
          />
@@ -317,6 +326,7 @@
      mainHeight: 0,
      tableHeight: 0,
      form: {
        socode:'',
        wkshopcode: '',
        wocode: '', // 工单编号
        partcode: '', // 产品编码
@@ -400,6 +410,7 @@
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        socode:this.form.socode,
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
@@ -447,6 +458,7 @@
      }
      const data = {
        socode:this.form.socode,
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
@@ -476,6 +488,7 @@
    },
    // 重置
    reset() {
      this.form.socode=''
      this.form.wkshopcode = ''
      this.form.wocode = ''
      this.form.partcode = ''
src/views/statistic/subcontractingOperation.vue
@@ -14,6 +14,9 @@
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="销售单号" style="display: flex;">
              <el-input v-model="form.socode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="车间名称" style=" display: flex;">
              <el-select
                v-model="form.wkshopcode"
@@ -36,7 +39,7 @@
            <el-form-item label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品名称" style=" display: flex;">
            <el-form-item label="产品名称"  v-show="isExpandForm" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <!--            <el-form-item label="规格型号" style=" display: flex;">-->
@@ -48,16 +51,16 @@
            <el-form-item v-show="isExpandForm" label="供方名称" style=" display: flex;">
              <el-input v-model="form.suppername" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="操作类型" style=" display: flex;">
              <el-select v-model="form.type" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in typeArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </el-form-item>
<!--            <el-form-item v-show="isExpandForm" label="操作类型" style=" display: flex;">-->
<!--              <el-select v-model="form.type" style="width: 200px" placeholder="请选择">-->
<!--                <el-option-->
<!--                  v-for="item in typeArr"-->
<!--                  :key="item.code"-->
<!--                  :label="item.name"-->
<!--                  :value="item.code"-->
<!--                />-->
<!--              </el-select>-->
<!--            </el-form-item>-->
            <el-form-item
              v-show="isExpandForm"
              style="display: flex;align-items: center"
@@ -130,6 +133,12 @@
          <el-table-column
            prop="wo_code"
            label="工单编号"
            width="160"
            sortable="custom"
          />
          <el-table-column
            prop="socode"
            label="销售单号"
            width="160"
            sortable="custom"
          />
@@ -367,6 +376,7 @@
      mainHeight: 0,
      tableHeight: 0,
      form: {
        socode:'',
        wkshopcode: '',
        wocode: '', // 工单编号
        partcode: '', // 产品编码
@@ -442,6 +452,7 @@
      }
      const data = {
        socode:this.form.socode,
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
@@ -482,6 +493,7 @@
      }
      const data = {
        socode:this.form.socode,
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partcode: this.form.partcode,
@@ -510,6 +522,7 @@
    },
    // 重置
    reset() {
      this.form.socode = ''
      this.form.wkshopcode = ''
      this.form.wocode = ''
      this.form.partcode = ''
src/views/statistic/workOrderProcess.vue
@@ -15,6 +15,11 @@
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="销售单号" style=" display: flex;">
              <el-input v-model="form.socode" placeholder="请输入" style="width: 200px"/>
            </el-form-item>
            <el-form-item label="车间名称" style=" display: flex;">
              <el-select
                v-model="form.wkshopcode"
@@ -42,20 +47,20 @@
              </el-select>
            </el-form-item>
            <el-form-item label="工单编号" style=" display: flex;">
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px" />
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px"/>
            </el-form-item>
            <!--            <el-form-item label="车间名称" style=" display: flex;">-->
            <!--              <el-input v-model="form.wkshopname" placeholder="请输入" style="width: 200px" />-->
            <!--            </el-form-item>-->
            <el-form-item label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
            <el-form-item label="产品编码" v-show="isExpandForm" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px"/>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="产品名称" style=" display: flex;">
              <el-input v-model="form.partname" placeholder="请输入" style="width: 200px" />
              <el-input v-model="form.partname" placeholder="请输入" style="width: 200px"/>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="规格型号" style=" display: flex;">
              <el-input v-model="form.partspec" placeholder="请输入" style="width: 200px" />
              <el-input v-model="form.partspec" placeholder="请输入" style="width: 200px"/>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="单据日期" style="display: flex;align-items: center">
              <el-date-picker
@@ -143,6 +148,13 @@
            sortable="custom"
          />
          <el-table-column
            prop="saleOrderCode"
            label="销售单号"
            width="135"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="partcode"
            label="产品编码"
            width="105"
@@ -220,8 +232,8 @@
                    />
                    <div style="position: absolute;top:22px;">{{ parseFloat(item.split('/')[1]) }}/{{
                      row.plan_qty
                    }}
                        row.plan_qty
                      }}
                    </div>
                  </div>
@@ -267,21 +279,21 @@
<script>
import Pagination from '@/components/Pagination'
import { handleDatetime } from '@/utils/global'
import {handleDatetime} from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import {
  ProductionScheduleReportExcelSearch,
  ProductionScheduleReportSearch
} from '@/api/ReportManager'
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
import {PrentOrganizationNoCompany} from '@/api/GeneralBasicData'
export default {
  name: 'Zzjg',
  components: {
    Pagination
  },
  directives: { elDragDialog, waves },
  directives: {elDragDialog, waves},
  data() {
    return {
      mouseHoverType: 'mouseout',
@@ -289,6 +301,7 @@
      mainHeight: 0,
      tableHeight: 0,
      form: {
        socode: '',//销售单号
        status: '', // 工单状态
        wocode: '', // 工单编号
        wkshopcode: '', // 工艺路线编码
@@ -303,9 +316,9 @@
        rows: 20 // 每页多少条
      },
      statusArr: [
        { label: '未开始', value: 'NOSTART' },
        { label: '执行中', value: 'START' },
        { label: '已完成', value: 'CLOSED' }
        {label: '未开始', value: 'NOSTART'},
        {label: '执行中', value: 'START'},
        {label: '已完成', value: 'CLOSED'}
      ],
      wkshopcodeArr: [],
@@ -325,7 +338,7 @@
  },
  methods: {
    async getPrentOrganizationNoCompany() {
      const { data: res } = await PrentOrganizationNoCompany()
      const {data: res} = await PrentOrganizationNoCompany()
      this.wkshopcodeArr = res
    },
    async getProductionScheduleReportSearch() {
@@ -334,6 +347,7 @@
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        socode: this.form.socode,
        status: this.form.status,
        wocode: this.form.wocode,
        wkshopcode: this.form.wkshopcode,
@@ -360,6 +374,7 @@
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        socode: this.form.socode,
        status: this.form.status,
        wocode: this.form.wocode,
        wkshopcode: this.form.wkshopcode,
@@ -375,7 +390,7 @@
      window.location.href = res.data
    },
    // 排序改变时
    sortChange({ column, prop, order }) {
    sortChange({column, prop, order}) {
      if (order === 'descending') {
        order = 'desc'
      } else if (order === 'ascending') {
@@ -393,6 +408,7 @@
    },
    // 重置
    reset() {
      this.form.socode=''
      this.form.status = ''
      this.form.wocode = ''
      this.form.wkshopcode = ''
@@ -412,7 +428,7 @@
        this.$refs.tableDataRef.doLayout()
      })
    },
    tableRowClassName({ row, rowIndex }) {
    tableRowClassName({row, rowIndex}) {
      return 'custom-row'
    }
  }
vue.config.js
@@ -52,7 +52,7 @@
    },
    proxy: {
      [process.env.VUE_APP_BASE_API]: {
        target: 'http://121.196.36.24:8019', // 本地
        target: 'http://121.196.36.24:8033', // 本地
        // target: 'http://192.168.0.147:8000', // 优克
        changeOrigin: true, // 请求跨域时,需 配置此项
        pathRewrite: { // 路径重写,替换target中的请求地址