src/views/scgl/gd.vue
@@ -50,6 +50,7 @@
              <el-date-picker
                v-model="form.paydate"
                type="date"
                value-format="yyyy-MM-dd HH:mm:ss"
                style="width: 200px"
                placeholder="选择日期"
              />
@@ -61,6 +62,7 @@
              <el-date-picker
                v-model="form.createdate"
                type="date"
                value-format="yyyy-MM-dd HH:mm:ss"
                style="width: 200px"
                placeholder="选择日期"
              />
@@ -74,18 +76,13 @@
      </div>
      <el-divider />
      <div style="margin-left: 10px;display: flex">
        <el-button
          type="primary"
          icon="el-icon-refresh-right"
        >同步ERP
        </el-button>
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button type="primary" icon="el-icon-connection" @click="send('send')">派发</el-button>
        <el-button
          type="primary"
          icon="el-icon-switch-button"
        >订单关闭
        </el-button>
        <!--        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>-->
        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
      </div>
      <el-divider />
      <div class="elTableDiv">
@@ -107,12 +104,12 @@
          <el-table-column
            width="50"
          >
            <template scope="scope">
            <template slot-scope="{row}">
              <el-radio
                v-model="radioSelected"
                :label="scope.$index"
                :label="row.wo_code"
                style="color: #fff;padding-left: 10px; margin-right: -25px;"
                @change.native="getCurrentRow(scope.row)"
                @change.native="getCurrentRow(row.wo_code)"
              />
            </template>
          </el-table-column>
@@ -129,23 +126,28 @@
          >
            <template slot-scope="{row}">
              <div v-if="row.status==='NEW'">新工单</div>
              <div v-if="row.status==='ALLOC'">已派发</div>
              <div v-if="row.status==='START'">开工</div>
              <div v-if="row.status==='CLOSED'">完工</div>
              <div v-if="row.status==='CREATING'">执行中</div>
              <div v-if="row.status==='CREATED'">已关闭</div>
              <!--              <div v-if="row.status==='ALLOC'">已派发</div>-->
              <!--              <div v-if="row.status==='START'">开工</div>-->
              <!--              <div v-if="row.status==='CLOSED'">完工</div>-->
            </template>
          </el-table-column>
          <el-table-column
            prop="wo_code"
            label="工单编号"
            sortable="custom"
            width="160"
          />
          <el-table-column
            prop="partcode"
            label="产品编码"
            sortable="custom"
            width="120"
          />
          <el-table-column
            prop="partname"
            min-width="150"
            label="产品名称"
            sortable="custom"
          />
@@ -157,46 +159,61 @@
          />
          <el-table-column
            prop="plan_qty"
            label="工数量"
            label="工单数"
            sortable="custom"
          />
          <el-table-column
            prop="plan_qty"
            label="生产车间"
            sortable="custom"
            width="100"
          />
          <el-table-column
            prop="wkshp_name"
            label="工艺路线"
            label="生产车间"
            sortable="custom"
            width="120"
          />
          <el-table-column
            prop="route_name"
            label="生产车间"
            label="工艺路线"
            sortable="custom"
            width="120"
          />
          <el-table-column
            prop="paydate"
            label="要求交付时间"
            prop="plan_startdate"
            label="计划开始时间"
            sortable="custom"
            width="160"
          />
          <el-table-column
            prop="plan_enddate"
            label="计划结束时间"
            sortable="custom"
            width="160"
          />
          <el-table-column
            prop="piroque"
            label="工单等级"
            sortable="custom"
            width="120"
          />
          <el-table-column
            prop="createuser"
            label="创建人员"
            sortable="custom"
            width="120"
          />
          <el-table-column
            prop="createdate"
            label="创建时间"
            width="160"
            sortable="custom"
          />
          <el-table-column
            label="操作"
            width="120"
            fixed="right"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <!--                <el-button type="text" @click="del(row)">删除</el-button>-->
                <el-button type="text" @click="check(row)">工序任务</el-button>
                <el-button v-if="row.status==='NEW'" type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
          </el-table-column>
@@ -216,61 +233,139 @@
    </div>
    <el-dialog
      :title="operation==='add'?'新增':'编辑'"
      :title="operation==='add'?'新增':'派发'"
      :visible.sync="dialogVisible"
      width="50%"
      width="60%"
      top="15vh"
      :close-on-click-modal="false"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <el-form-item label="订单状态" prop="OrgCode">
        <el-form-item
          label="订单状态"
          prop="mesorderstus"
        >
          <el-select
            v-model="form.partcode"
            disabled
            v-model="dialogForm.mesorderstus"
            :disabled="operation!=='add'"
            :popper-append-to-body="false"
            style="width: 220px"
            style="width: 200px"
            placeholder="请选择"
          >
            <el-option
              v-for="item in OrgTypeArr"
              v-for="item in erporderstusArr"
              :key="item.code"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="订单编号" prop="OrgCode">
          <el-input v-model="dialogForm.OrgCode" disabled style="width: 220px" />
        <el-form-item
          v-if="operation==='add'"
          label="产品信息"
          prop="partcode"
        >
          <el-select
            v-model="dialogForm.partcode"
            :disabled="operation!=='add'"
            :popper-append-to-body="false"
            style="width: 200px"
            placeholder="请选择"
            @change="partcodeChange"
          >
            <el-option
              v-for="item in partArr"
              :key="item.partcode"
              :label="item.partname"
              :value="item.partcode"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="产品编码" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
        <el-form-item label="工单编号" prop="mesordercode">
          <el-input v-model="dialogForm.mesordercode" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="产品名称" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
        <el-form-item v-if="operation!=='add'" label="产品编码" prop="partcode">
          <el-input v-model="dialogForm.partcode" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="订单数量" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
        <el-form-item v-if="operation!=='add'" label="产品名称" prop="partname">
          <el-input v-model="dialogForm.partname" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="产品规格" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
        <el-form-item label="工单数量" prop="mesqty">
          <el-input
            v-model="dialogForm.mesqty"
            oninput="value=value.replace(/[^0-9.]/g,'')"
            :disabled="operation!=='add'"
            style="width: 200px"
          />
        </el-form-item>
        <el-form-item label="下达数量" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        <el-form-item v-if="operation!=='add'" label="产品规格" prop="partspec">
          <el-input v-model="dialogForm.partspec" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="下单数量" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        <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>
        <el-form-item label="交付时间" prop="OrgName">
        <el-form-item label="工艺路线" prop="routecode">
          <el-select
            v-model="dialogForm.routecode"
            :disabled="dialogForm.partcode===''"
            :popper-append-to-body="false"
            style="width: 200px"
            placeholder="请选择"
          >
            <el-option
              v-for="item in routeArr"
              :key="item.route_code"
              :label="item.route_name"
              :value="item.route_code"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="开始时间" prop="planstartdate">
          <el-date-picker
            v-model="dialogForm.OrgName"
            v-model="dialogForm.planstartdate"
            type="date"
            style="width: 220px"
            value-format="yyyy-MM-dd HH:mm:ss"
            style="width: 200px"
            placeholder="选择日期"
          />
          <!--          <el-input v-model="dialogForm.OrgName" style="width: 220px" />-->
        </el-form-item>
        <el-form-item label="结束时间" prop="planenddate">
          <el-date-picker
            v-model="dialogForm.planenddate"
            type="date"
            value-format="yyyy-MM-dd HH:mm:ss"
            style="width: 200px"
            placeholder="选择日期"
          />
        </el-form-item>
        <el-form-item label="工单等级" prop="orderlev">
          <el-select
            v-model="dialogForm.orderlev"
            :popper-append-to-body="false"
            style="width: 200px"
            placeholder="请选择"
          >
            <el-option
              v-for="item in orderlevArr"
              :key="item.code"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
@@ -284,9 +379,9 @@
<script>
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import { ErpOrderSearch, MesOrderSearch } from '@/api/scgl'
import { DeleteMesOrder, MesOrderSearch } from '@/api/scgl'
import { WorkShopSelect } from '@/api/sbgl'
import { PartSelect, PartSelectRpute } from '@/api/zzmx'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -324,30 +419,71 @@
      },
      erporderstusArr: [
        { code: 'NEW', name: '新工单' },
        { code: 'ALLOC', name: '已派发' },
        { code: 'START', name: '开工' },
        { code: 'CLOSED', name: '完工' }
        { code: 'CREATING', name: '执行中' },
        { code: 'CREATED', name: '已关闭' }
        // { code: 'ALLOC', name: '已派发' },
        // { code: 'START', name: '开工' },
        // { code: 'CLOSED', name: '完工' }
      ],
      total: 10,
      radioSelected: '',
      tableData: [],
      dialogVisible: false,
      dialogForm: {
        OrgType: '',
        OrgCode: '',
        OrgName: '',
        SupUnit: ''// 上级单位
        partname: '', // 产品名称
        partspec: '', // 产品规格
        wkshopname: '', // 生产车间名称
        routename: '', // 工艺路线名称
        mesorderstus: '', // 工单状态码
        mesordercode: '', // 工单编号
        partcode: '', // 产品编码
        mesqty: '', // 工单数量
        routecode: '', // 工艺路线编码
        wkshopcode: '', // 生产车间编码
        planstartdate: '', // 计划开始时间
        planenddate: '', // 计划完成时间
        orderlev: '', // 工单等级
        OperType: '' // 操作类型
      },
      partArr: [], // 产品信息
      wkshopArr: [], // 生产车间数组
      routeArr: [], // 工艺路线数组
      orderlevArr: [
        { code: '101', name: '一般' },
        { code: '102', name: '重要' },
        { code: '103', name: '特级' }
      ], // 工单等级数组
      operation: '',
      dialogFormRules: {
        OrgType: [
          { required: true, message: '请输入选择类型', trigger: ['blur', 'change'] }
        mesorderstus: [
          { required: true, message: '请选择订单状态', trigger: ['blur', 'change'] }
        ],
        OrgCode: [
        partcode: [
          { required: true, message: '请选择产品信息', trigger: ['blur', 'change'] }
        ],
        mesordercode: [
          { required: true, validator: validateName, trigger: ['blur', 'change'] }
        ],
        OrgName: [
          { required: true, message: '请输入名称', trigger: ['blur', 'change'] }
        mesqty: [
          { required: true, message: '请输入工单数量', trigger: ['blur', 'change'] }
        ],
        wkshopcode: [
          { required: true, message: '请选择生产车间', trigger: ['blur', 'change'] }
        ],
        routecode: [
          { required: true, message: '请选择工艺路线', trigger: ['blur', 'change'] }
        ],
        planstartdate: [
          { required: true, message: '请选择开始时间', trigger: ['blur', 'change'] }
        ],
        planenddate: [
          { required: true, message: '请选择结束时间', trigger: ['blur', 'change'] }
        ],
        orderlev: [
          { required: true, message: '请选择工单等级', trigger: ['blur', 'change'] }
        ]
      }
@@ -356,6 +492,7 @@
  },
  created() {
    this.getMesOrderSearch()
    this.getSelect()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
@@ -366,6 +503,15 @@
      const res = await MesOrderSearch(this.form)
      this.tableData = res.data
      this.total = res.count
    },
    async  getSelect() {
      // 获取产品信息
      const { data: res1 } = await PartSelect()
      this.partArr = res1
      // 获取生产车间数组
      const { data: res2 } = await WorkShopSelect()
      this.wkshopArr = res2
    },
    // 排序改变时
    sortChange({ column, prop, order }) {
@@ -384,11 +530,9 @@
    search() {
      this.getMesOrderSearch()
    },
    upload() {
    },
    // 重置
    reset() {
    reset(val) {
      this.form.erporderstus = ''
      this.form.erpordercode = ''
      this.form.partcode = ''
@@ -400,49 +544,99 @@
      this.getMesOrderSearch()
    },
    // 单选框选中获取当前行信息
    getCurrentRow(row) {
      console.log(row, 1)
      this.radioSelected = row
    getCurrentRow(wo_code) {
      this.radioSelected = wo_code
    },
    // 新增按钮
    add(operation) {
    async add(operation) {
      this.operation = operation
      this.dialogVisible = true
    },
    // 修改按钮
    edit(operation, row) {
    // 产品信息值改变
    async partcodeChange(val) {
      const { data: res } = await PartSelectRpute({ partcode: val })
      this.routeArr = res
      this.dialogForm.routecode = ''
    },
    // 工序任务
    check() {
    },
    // 派发
    send(operation) {
      if (this.radioSelected.length < 1) {
        return this.$message.info('请先选择工单!')
      }
      const row = this.tableData.find(item => item.wo_code === this.radioSelected)
      if (row.status !== 'NEW') {
        return this.$message.info('此工单为非未开始状态,不可派发!')
      }
      this.operation = operation
      this.dialogVisible = true
      this.$nextTick(() => {
        this.dialogForm.OrgCode = row.org_code
        this.dialogForm.OrgName = row.org_name
        this.dialogForm.SupUnit = row.parent_id
        this.dialogForm.mesorderstus = row.status
        this.dialogForm.mesordercode = row.wo_code
        this.dialogForm.partcode = row.partcode
        this.partcodeChange(row.partcode)
        this.dialogForm.partname = row.partname
        this.dialogForm.mesqty = row.plan_qty
        this.dialogForm.partspec = row.partspec
        this.dialogForm.routecode = row.route_code// 工艺路线代码
        this.dialogForm.wkshopcode = row.wkshp_code// 生产车间代码
        // handleDatatime(row.plan_startdate.toString().length > 0)
        this.dialogForm.planstartdate = row.plan_startdate
        this.dialogForm.planenddate = row.plan_enddate
        this.dialogForm.orderlev = row.piroque // 等级
      })
    },
    // 删除按钮
    async del(row) {
      // if (row.status !== 'NEW') {
      //   return this.$message.success('')
      // }
      this.$confirm('是否确认删除?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        DeleteOrganization({ orgid: row.code }).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            this.getMesOrderSearch()
          }
        })
        console.log(row, 1)
        const data = {
          wocode: row.wo_code,
          m_po: row.m_po,
          orderqty: row.plan_qty
        }
        console.log(data, 2)
        // DeleteMesOrder(data).then(res => {
        //   if (res.code === '200') {
        //     this.$message.success('删除成功!')
        //     this.getMesOrderSearch()
        //   }
        // })
      }).catch(() => {
        this.$message.info('已取消删除')
      })
    },
    // 对话框关闭事件
    handleClose() {
      this.dialogForm.OrgType = ''
      this.dialogForm.OrgCode = ''
      this.dialogForm.OrgName = ''
      this.dialogForm.SupUnit = ''
      this.dialogForm.partname = '' // 产品名称
      this.dialogForm.partspec = '' // 产品规格
      this.dialogForm.wkshopname = '' // 生产车间名称
      this.dialogForm.routename = '' // 工艺路线名称
      this.dialogForm.mesorderstus = '' // 工单状态码
      this.dialogForm.mesordercode = '' // 工单编号
      this.dialogForm.partcode = '' // 产品编码
      this.dialogForm.mesqty = '' // 工单数量
      this.dialogForm.routecode = '' // 工艺路线编码
      this.dialogForm.wkshopcode = '' // 生产车间编码
      this.dialogForm.planstartdate = '' // 计划开始时间
      this.dialogForm.planenddate = '' // 计划完成时间
      this.dialogForm.orderlev = '' // 工单等级
      this.$refs.dialogForm.clearValidate()
    },
    // 对话框取消
@@ -454,20 +648,33 @@
      this.$refs.dialogForm.validate(valid => {
        if (valid) {
          const data = {
            OrganCode: this.dialogForm.OrgCode,
            OrganName: this.dialogForm.OrgName,
            OperType: this.operation === 'add' ? 'Add' : 'Update',
            Operator: getCookie('admin')
            partname: this.dialogForm.partname, // 产品名称
            partspec: this.dialogForm.partspec, // 产品规格
            wkshopname: this.dialogForm.wkshopname, // 生产车间名称
            routename: this.dialogForm.routename, // 工艺路线名称
            mesorderstus: this.dialogForm.mesorderstus, // 工单状态码
            mesordercode: this.dialogForm.mesordercode, // 工单编号
            partcode: this.dialogForm.partcode, // 产品编码
            mesqty: this.dialogForm.mesqty, // 工单数量
            routecode: this.dialogForm.routecode, // 工艺路线编码
            wkshopcode: this.dialogForm.wkshopcode, // 生产车间编码
            planstartdate: this.dialogForm.planstartdate, // 计划开始时间
            planenddate: this.dialogForm.planenddate, // 计划完成时间
            orderlev: this.dialogForm.orderlev, // 工单等级
            OperType: this.operation === 'add' ? 'Add' : 'Update'
          }
          AddUpdateOrganization(data).then(res => {
            if (res.code === '200') {
              this.$message.success(this.operation === 'add' ? '添加成功!' : '修改成功!')
              this.dialogVisible = false
              this.getMesOrderSearch()
            } else {
              this.$message.error(this.operation === 'add' ? '添加失败!' : '修改失败!')
            }
          })
          console.log(data, 1)
          // AddUpdateMesOrder(data).then(res => {
          //   if (res.code === '200') {
          //     this.$message.success(this.operation === 'add' ? '添加成功!' : '修改成功!')
          //     this.dialogVisible = false
          //     this.getMesOrderSearch()
          //   } else {
          //     this.$message.error(this.operation === 'add' ? '添加失败!' : '修改失败!')
          //   }
          // })
        }
      })
    },
@@ -646,8 +853,8 @@
  border-color: $main_color;
}
.elTableDiv{
  ::v-deep .el-radio__label{
.elTableDiv {
  ::v-deep .el-radio__label {
    display: none;
  }
}