小小儁爺
2024-09-20 dff1f3ff97550bd88468c365fefe1e8119467577
1.工单新增三个字段
已修改9个文件
185 ■■■■■ 文件已修改
src/views/kanbanManager/cj.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/kanbanManager/cj2.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/kanbanManager/ckgl.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/produce/reportCorrect.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/produce/reportVerify.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/workOrder/produceOrderList.vue 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/workOrder/workOrderClose.vue 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/workOrder/workOrderList.vue 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/workOrder/workOrderSend.vue 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/kanbanManager/cj.vue
@@ -133,7 +133,7 @@
        ],
        // index: true,
        columnWidth: [150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150],
        columnWidth: [200, 140, 150, 290, 130, 130, 130, 130, 130, 130, 130, 130, 130],
        align: ['center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center']
        // carousel: 'page'
      }
src/views/kanbanManager/cj2.vue
@@ -133,7 +133,7 @@
        ],
        // index: true,
        columnWidth: [150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150],
        columnWidth: [200, 140, 150, 290, 130, 130, 130, 130, 130, 130, 130, 130, 130],
        align: ['center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center']
        // carousel: 'page'
      }
src/views/kanbanManager/ckgl.vue
@@ -135,7 +135,7 @@
        ],
        index: true,
        columnWidth: [50, 150, 150, 150, 150, 150, 150, 150, 150],
        columnWidth: [50, 130, 150, 300, 200, 120, 120, 120, 120],
        align: ['center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center']
        // carousel: 'page'
      },
src/views/produce/reportCorrect.vue
@@ -186,13 +186,13 @@
          </el-table-column>
          <el-table-column
            prop="wx_name"
            label="供应商"
            label="设备/供应商"
            show-overflow-tooltip
            sortable="custom"
            min-width="110"
            min-width="125"
          >
            <template slot-scope="{row}">
              {{ row.wx_name ? row.wx_name : '/' }}
              {{ row.steptype === 'Z' ?(row.eqp_name?row.eqp_name:'/'): row.wx_name }}
            </template>
          </el-table-column>
          <el-table-column
src/views/produce/reportVerify.vue
@@ -225,13 +225,13 @@
          </el-table-column>
          <el-table-column
            prop="wx_name"
            label="供应商"
            label="设备/供应商"
            show-overflow-tooltip
            sortable="custom"
            min-width="110"
            min-width="125"
          >
            <template slot-scope="{row}">
              {{ row.wx_name ? row.wx_name : '/' }}
              {{ row.steptype === 'Z' ?(row.eqp_name?row.eqp_name:'/'): row.wx_name }}
            </template>
          </el-table-column>
          <el-table-column
src/views/workOrder/produceOrderList.vue
@@ -262,6 +262,33 @@
            sortable="custom"
          />
          <el-table-column
            prop="injectnumber"
            label="注塑机号"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.injectnumber?row.injectnumber:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="customername"
            label="客户名称"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.customername?row.customername:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="colour"
            label="颜色"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="clerkuser"
            label="销售业务员"
            show-tooltip-when-overflow
@@ -451,6 +478,28 @@
          />
        </el-form-item>
        <el-form-item label="注塑机号">
          <el-input
            v-model="dialogForm.injectnumber"
            style="width: 200px"
            disabled
          />
        </el-form-item>
        <el-form-item label="客户名称">
          <el-input
            v-model="dialogForm.customername"
            style="width: 200px"
            disabled
          />
        </el-form-item>
        <el-form-item label="颜色">
          <el-input
            v-model="dialogForm.colour"
            style="width: 200px"
            disabled
          />
        </el-form-item>
        <el-form-item label="销售业务员" prop="">
          <el-input
            v-model="dialogForm.clerkuser"
@@ -579,7 +628,13 @@
        clerkuser: '', // 销售业务员
        saleOrderDeliveryDate: '' // 预计交付日期
        saleOrderDeliveryDate: '', // 预计交付日期
        'injectnumber': '', // 注塑机号
        'customercode': '', // 客户编号
        'customername': '', // 客户名称
        'colour': ''// 颜色
      },
      operation: '',
      dialogFormRules: {
@@ -871,6 +926,11 @@
        this.dialogForm.ordernum = 1
        this.dialogForm.relse_qty = row.relse_qty
        this.dialogForm.clerkuser = row.clerkuser
        this.dialogForm.injectnumber = row.injectnumber
        this.dialogForm.customercode = row.customercode
        this.dialogForm.customername = row.customername
        this.dialogForm.colour = row.colour
      })
    },
    // 对话框关闭事件
@@ -934,6 +994,10 @@
            'markqty': this.dialogForm.markqty,
            'ordernum': this.dialogForm.ordernum,
            'relse_qty': this.dialogForm.relse_qty,
            'injectnumber': this.dialogForm.injectnumber, // 注塑机号
            'customercode': this.dialogForm.customercode, // 客户编号
            'customername': this.dialogForm.customername, // 客户名称
            'colour': this.dialogForm.colour, // 颜色
            'saleOrderDeliveryDate': handleDatetime(this.dialogForm.saleOrderDeliveryDate) + ' 00:00:00'
          }
src/views/workOrder/workOrderClose.vue
@@ -259,6 +259,33 @@
            width="100"
          />
          <el-table-column
            prop="injectnumber"
            label="注塑机号"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.injectnumber?row.injectnumber:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="customername"
            label="客户名称"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.customername?row.customername:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="colour"
            label="颜色"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="wkshp_name"
            label="生产车间"
            show-tooltip-when-overflow
src/views/workOrder/workOrderList.vue
@@ -263,6 +263,33 @@
            width="100"
          />
          <el-table-column
            prop="injectnumber"
            label="注塑机号"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.injectnumber?row.injectnumber:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="customername"
            label="客户名称"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.customername?row.customername:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="colour"
            label="颜色"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="clerkuser"
            label="销售业务员"
            sortable="custom"
@@ -348,7 +375,7 @@
                    :style="{color:$store.state.settings.theme}"
                    class="el-icon-printer"
                    style="cursor: pointer;margin-right: 15px"
                    @click.stop="handlePrint(row.wo_code)"
                    @click.stop="handlePrint(row)"
                  />
                </el-tooltip>
@@ -1273,6 +1300,16 @@
                </el-form-item>
                <el-form-item label="工单数量:" class="formContent">
                  {{ formApprove.plan_qty }}
                </el-form-item>
                <el-form-item label="注塑机号:" class="formContent">
                  {{ formApprove.injectnumber }}
                </el-form-item>
                <el-form-item label="客户名称:" class="formContent">
                  {{ formApprove.customername }}
                </el-form-item>
                <el-form-item label="颜色:" class="formContent">
                  {{ formApprove.colour }}
                </el-form-item>
                <!--                <el-form-item label="工艺路线:" class="formContent">-->
                <!--                  {{ formApprove.routename }}-->
@@ -2717,13 +2754,13 @@
      this.dialogVisibleSearch = false
    },
    // 处理打印
    handlePrint(wo_code) {
    handlePrint(row) {
      // const number = Math.random() * Math.random()
      // this.number = number === 0 ? (10 + Math.random()) : number
      // console.log(number)
      const data2 = {
        mesordercode: wo_code || this.dialogForm.mesordercode
        mesordercode: row.wo_code || this.dialogForm.mesordercode
      }
      MesOrderPrintSearch(data2).then(res2 => {
        if (res2.code === '200') {
@@ -2739,6 +2776,10 @@
          this.formApprove.routename = localStorage.getItem('username') // 打印人员
          this.formApprove.lm_date = res3[0].lm_date
          this.formApprove.injectnumber = row.injectnumber || '/'
          this.formApprove.customername = row.customername || '/'
          this.formApprove.colour = row.colour || '/'
          this.$nextTick(() => {
            res3.forEach(i => {
              this.bindQRCode(i.seq, i.stepqrcode, 'small')
src/views/workOrder/workOrderSend.vue
@@ -264,6 +264,33 @@
            width="100"
          />
          <el-table-column
            prop="injectnumber"
            label="注塑机号"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.injectnumber?row.injectnumber:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="customername"
            label="客户名称"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.customername?row.customername:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="colour"
            label="颜色"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="wkshp_name"
            label="生产车间"
            show-tooltip-when-overflow