loulijun2021
2023-11-22 9c2dd43fb70b6cdeaba40aa0173d4ceb759cd46a
1.开报工放出  销售订单查询  条件
已修改2个文件
53 ■■■■■ 文件已修改
src/views/produceManager/produceStartOrder.vue 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/produceManager/workOrder.vue 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/produceManager/produceStartOrder.vue
@@ -5,14 +5,14 @@
        <el-tab-pane label="生产列表">
          <div style="margin-left: 10px;margin-top:10px;display: flex;justify-content: space-between">
            <div style="display: flex;align-items: center">
              <div style="width: 90px">扫描条码:</div>
              <div style="width: 70px">扫描条码</div>
              <!--              oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"-->
              <el-input
                id="keyWords"
                v-model="form.wocode"
                name="produceCode"
                placeholder="请扫码或输入工单号"
                style="width: 300px"
                style="width: 260px"
                @keyup.enter.native="val=>enterNative(val,'produceCode')"
              />
              <!--              <div style="width: 90px;margin-left: 20px">生产设备:</div>-->
@@ -30,27 +30,35 @@
              <!--                />-->
              <!--              </el-select>-->
              <div style="width: 90px;margin-left: 20px">产品编码:</div>
              <div style="width: 70px;margin-left: 20px">销售单号</div>
              <el-input
                v-model="form.saleOrderCode"
                placeholder="请输入"
                style="width: 180px"
                @keyup.enter.native="val=>enterNative(val,'produceCode')"
              />
              <div style="width: 70px;margin-left: 20px">产品编码</div>
              <el-input
                v-model="form.partcode"
                placeholder="请输入"
                style="width: 200px"
                style="width: 180px"
                @keyup.enter.native="val=>enterNative(val,'produceCode')"
              />
              <div style="width: 90px;margin-left: 20px">产品名称:</div>
              <div style="width: 70px;margin-left: 20px">产品名称</div>
              <el-input
                v-model="form.partname"
                placeholder="请输入"
                style="width: 200px"
                style="width:180px"
                @keyup.enter.native="val=>enterNative(val,'produceCode')"
              />
              <div style="width: 90px;margin-left: 20px">规格型号:</div>
              <el-input
                v-model="form.partspec"
                placeholder="请输入"
                style="width: 200px"
                @keyup.enter.native="val=>enterNative(val,'produceCode')"
              />
              <!--              <div style="width: 70px;margin-left: 20px">规格型号</div>-->
              <!--              <el-input-->
              <!--                v-model="form.partspec"-->
              <!--                placeholder="请输入"-->
              <!--                style="width:180px"-->
              <!--                @keyup.enter.native="val=>enterNative(val,'produceCode')"-->
              <!--              />-->
            </div>
            <div style="display: flex;padding-right: 10px">
@@ -1587,6 +1595,7 @@
        // orderstepqrcode: '', // 扫描的二维码信息
        // SelectType: '', // 设备编码
        wocode: '',
        saleOrderCode: '', // 销售单号
        partcode: '', // 产品编码
        partname: '', // 产品名称
        partspec: '', // 规格型号
@@ -1945,6 +1954,7 @@
    },
    reset() {
      this.form.wocode = ''
      this.form.saleOrderCode = ''
      this.form.partcode = ''
      this.form.partname = ''
      this.form.partspec = ''
src/views/produceManager/workOrder.vue
@@ -176,8 +176,8 @@
              <div v-if="row.status==='ALLO'">已派发</div>
              <div v-if="row.status==='START'">开工</div>
              <div v-if="row.status==='CLOSED'">完工</div>
              <div v-if="row.status==='NOSCHED'">待排程</div>
              <div v-if="row.status==='SCHED'">已排程</div>
              <!--              <div v-if="row.status==='NOSCHED'">待排程</div>-->
              <!--              <div v-if="row.status==='SCHED'">已排程</div>-->
            </template>
          </el-table-column>
          <el-table-column
@@ -2063,9 +2063,9 @@
        // { code: 'CREATED', name: '已关闭' }
        { code: 'ALLO', name: '已派发' },
        { code: 'START', name: '开工' },
        { code: 'CLOSED', name: '完工' },
        { code: 'NOSCHED', name: '待排程' },
        { code: 'SCHED', name: '已排程' }
        { code: 'CLOSED', name: '完工' }
        // { code: 'NOSCHED', name: '待排程' },
        // { code: 'SCHED', name: '已排程' }
      ],
      total: 10,
      radioSelected: '',
@@ -2581,9 +2581,10 @@
      console.log('工单关闭事件')
      this.tableData.forEach(item => {
        if (item.wo_code === this.radioSelected) {
          if (item.status === 'START') {
            return this.$message.info('当前工单未完工,无法关闭!')
          } else if (item.status === 'CLOSED') {
          // if (item.status === 'START') {
          //   return this.$message.info('当前工单未完工,无法关闭!')
          // } else
          if (item.status === 'CLOSED') {
            return this.$message.info('工单已关闭,无需再关闭!')
          } else {
            this.$confirm('是否确认关闭工单?', '提示', {