1.修改bug2.工序检验实现部分3.缺陷定义实现部分

loulijun2021

2022-07-16 392f9468875a8721c17c4e15c288333017cac4a1

 src/views/scgl/gd.vue

@@ -12,10 +12,12 @@
          <div class="elForm">
            <el-form-item label="订单状态" style=" display: flex;">
              <el-select
                v-model="form.erporderstus"
                v-model="form.mesorderstus"
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
                filterable
                @change="erporderstusChange"
              >
                <el-option
                  v-for="item in erporderstusArr"
@@ -26,7 +28,7 @@
              </el-select>
            </el-form-item>
            <el-form-item label="订单编号" style=" display: flex;">
              <el-input v-model="form.erpordercode" placeholder="请输入" style="width: 200px" />
              <el-input v-model="form.mesordercode" placeholder="请输入" style="width: 200px" />
            </el-form-item>

            <el-form-item label="产品编码" style=" display: flex;">
@@ -50,14 +52,23 @@
              <el-input v-model="form.creatuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item label="创建时间" style=" display: flex;">
              <!--              <el-date-picker-->
              <!--                v-model="form.createdate"-->
              <!--                type="daterange"-->
              <!--                :clearable="false"-->
              <!--                range-separator="~"-->
              <!--                start-placeholder="开始日期"-->
              <!--                end-placeholder="结束日期"-->
              <!--                size="mini"-->
              <!--              />-->
              <el-date-picker
                v-model="form.createdate"
                type="daterange"
                :clearable="false"
                range-separator="~"
                start-placeholder="开始日期"
                end-placeholder="结束日期"
                type="date"
                size="mini"
                :clearable="false"
                style="width: 200px;"
                format="yyyy-MM-dd"
                placeholder="选择日期"
              />
            </el-form-item>
          </div>
@@ -92,7 +103,7 @@
      <div class="elTableDiv">
        <el-table
          :data="tableData"
          :height="tableHeight"
          :height="tableHeight+'px'"
          border
          stripe
          :style="{width: 100+'%',height:tableHeight+'px',}"
@@ -179,7 +190,7 @@
            prop="route_name"
            label="工艺路线"
            sortable="custom"
            width="120"
            width="130"
          />

          <el-table-column
@@ -268,6 +279,7 @@
          <el-select
            v-model="dialogForm.mesorderstus"
            disabled
            filterable
            :popper-append-to-body="false"
            style="width: 200px"
            placeholder="请选择"
@@ -299,6 +311,7 @@
        >
          <el-select
            v-model="dialogForm.partcode"
            filterable
            :disabled="operation!=='add'"
            :popper-append-to-body="false"
            style="width: 200px"
@@ -323,29 +336,16 @@
          <el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
        </el-form-item>
        <div style="display: flex">
          <el-form-item label="生产车间" prop="wkshopcode">
            <el-select
              v-model="dialogForm.wkshopcode"
              :popper-append-to-body="false"
              style="width: 200px"
              placeholder="请选择"
            >
              <el-option
                v-for="item in wkshopArr"
                :key="item.code"
                :label="item.name"
                :value="item.code"
              />
            </el-select>
          </el-form-item>
          <div style="display: flex;flex-wrap: nowrap">
            <el-form-item label="工艺路线" prop="routecode">
              <el-select
                v-model="dialogForm.routecode"
                filterable
                :disabled="dialogForm.partcode===''"
                :popper-append-to-body="false"
                style="width: 160px"
                style="width: 172px"
                placeholder="请选择"
                @change="routecodeChange"
              >
                <el-option
                  v-for="item in routeArr"
@@ -364,6 +364,23 @@
            <!--            :disabled="dialogForm.routecode===''"-->

          </div>
          <el-form-item label="生产车间" prop="wkshopcode">
            <el-select
              v-model="dialogForm.wkshopcode"
              filterable
              :popper-append-to-body="false"
              style="width: 200px;"
              placeholder="请选择"
              :disabled="dialogForm.routecode===''"
            >
              <el-option
                v-for="item in wkshopArr"
                :key="item.org_code"
                :label="item.org_name"
                :value="item.org_code"
              />
            </el-select>
          </el-form-item>
        </div>
        <el-form-item label="计划开始时间" prop="planstartdate">
          <el-date-picker
@@ -388,6 +405,7 @@
        <el-form-item label="工单等级" prop="orderlev">
          <el-select
            v-model="dialogForm.orderlev"
            filterable
            :popper-append-to-body="false"
            style="width: 200px"
            placeholder="请选择"
@@ -406,10 +424,11 @@
      <el-dialog
        title="工序"
        :visible.sync="dialogVisibleSearch"
        width="540px"
        top="25vh"
        width="840px"
        top="20vh"
        class="dialogVisibleSearch"
        append-to-body
        :close-on-click-modal="false"
      >
        <el-table
          :data="searchTableData"
@@ -452,7 +471,8 @@
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="dialogVisibleCancel">取 消</el-button>
          <el-button type="primary" @click="dialogVisibleConfirm">确 定</el-button>
          <el-button v-if="operation==='add'" type="primary" @click="dialogVisibleConfirm">确 定</el-button>
          <el-button v-else type="primary" @click="dialogVisibleConfirm">确 定/打 印</el-button>
        </div>
      </span>
    </el-dialog>
@@ -539,16 +559,19 @@
  ClosedErpOrder,
  ClosedMesOrder,
  DeleteMesOrder,
  MesOrderSearch, SearchWorkStep,
  MesOrderSearch, RouteSelectWkshop, SearchWorkStep,
  SelectRouteStep
} from '@/api/scgl'
import { WorkShopSelect } from '@/api/sbgl'
import { PartSelect, PartSelectRpute } from '@/api/zzmx'
import { handleDatetime } from '@/utils/global'
import { getCookie } from '@/utils/auth'
import { MesOrderPrintSearch1 } from '@/api/utils'
import { urlAddRandomNo, webapp_urlprotocol_startup, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: 'Zzjg',
  name: 'GD',
  components: {
    Pagination
  },
@@ -682,13 +705,15 @@
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
    // webapp_urlprotocol_startup()
    webapp_ws_autoupdate(true)
  },
  methods: {
    async getMesOrderSearch() {
      let tempDate = this.form.createdate
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      // let tempDate = this.form.createdate
      // if (tempDate.length > 0) {
      //   tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      // }

      const data = {
        mesorderstus: this.form.mesorderstus, // 工单状态码
@@ -697,7 +722,7 @@
        partname: this.form.partname, // 产品名称
        partspec: this.form.partspec, // 产品规格
        creatuser: this.form.creatuser, // 创建人员
        createdate: tempDate, // 创建时间
        createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 创建时间
        prop: this.form.prop, // 排序字段
        order: this.form.order, // 排序字段
        page: this.form.page, // 第几页
@@ -713,10 +738,10 @@
      // 获取产品信息
      const { data: res1 } = await PartSelect()
      this.partArr = res1

      // 获取生产车间数组
      const { data: res2 } = await WorkShopSelect()
      this.wkshopArr = res2
    },
    // 订单状态改变时
    erporderstusChange(val) {
      this.form.mesorderstus = val
    },
    // 排序改变时
    sortChange({ column, prop, order }) {
@@ -738,8 +763,8 @@

    // 重置
    reset(val) {
      this.form.erporderstus = ''
      this.form.erpordercode = ''
      this.form.mesorderstus = ''
      this.form.mesordercode = ''
      this.form.partcode = ''
      this.form.partname = ''
      this.form.partspec = ''
@@ -766,9 +791,21 @@
      const { data: res } = await PartSelectRpute({ partcode: val })
      this.routeArr = res
      this.dialogForm.routecode = ''
      this.dialogForm.wkshopcode = ''
    },
    // 工艺路线值改变
    async routecodeChange(val) {
      const data = {
        partcode: this.dialogForm.partcode,
        routecode: this.dialogForm.routecode
      }
      // 获取生产车间数组
      const { data: res2 } = await RouteSelectWkshop(data)
      this.wkshopArr = res2
      this.dialogForm.wkshopcode = ''
    },
    // 工序任务
    async  check(row) {
    async check(row) {
      this.dialogVisibleTask = true
      const { data: res } = await SearchWorkStep({ wo_code: row.wo_code })
      this.taskTableData = res
@@ -798,7 +835,7 @@
        this.dialogForm.mesqty = row.plan_qty
        this.dialogForm.partspec = row.partspec
        // this.dialogForm.routecode = row.route_code// 工艺路线代码
        this.dialogForm.wkshopcode = row.wkshp_code// 生产车间代码
        // this.dialogForm.wkshopcode = row.wkshp_code// 生产车间代码

        this.dialogForm.planstartdate = row.plan_startdate !== null ? row.plan_startdate : handleDatetime(new Date())
        this.dialogForm.planenddate = row.plan_enddate !== null ? row.plan_enddate : handleDatetime(new Date())
@@ -926,9 +963,11 @@
            orderlev: this.dialogForm.orderlev, // 工单等级
            OperType: this.operation === 'add' ? 'Add' : 'Update'
          }
          console.log(data, 1)
          AddUpdateMesOrder(data).then(res => {
            if (res.code === '200') {
              if (this.operation !== 'add') {
                this.sendPrint()
              }
              this.$message.success(this.operation === 'add' ? '添加成功！' : '派发成功！')
              this.dialogVisible = false
              this.getMesOrderSearch()
@@ -939,12 +978,31 @@
        }
      })
    },
    // 派发打印
    async sendPrint() {
      const data = {
        username: getCookie('admin'),
        mesordercode: this.dialogForm.mesordercode
      }
      const res = await MesOrderPrintSearch1(data)
      if (res.code === '200') {
        // 参数具体说明请参考帮助文档中的“WEB报表(B/S报表)->WEB报表客户端->启动参数说明”部分
        var args = {
          type: 'print', // preview  print
          showOptionDlg: false, // 如果不显示打印对话框而直接打印，将此行注释去掉即可
          report: urlAddRandomNo('./static/grf/产品流传单A4.grf'),
          data: res.data
        }

        webapp_ws_ajax_run(args)
      }
    },
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        this.isFullscreen = window.innerHeight < 800
        // this.isFullscreen = window.innerHeight < 800
        if (this.isFullscreen) {
          this.tableHeight = this.tableHeight - 50
        }
@@ -1018,6 +1076,7 @@
::v-deep .el-dialog__body {
  padding: 20px 100px !important;
}

.dialogVisibleSearch ::v-deep .el-dialog__body {
  padding: 20px 20px !important;
}