modified: src/views/basic/company/index.vue modified: src/views/basic...

zouyu

2023-12-21 a48ded866d223f581944ea9043df1b296b3425e3

 src/views/plan/manufacturingorder/index.vue

@@ -101,6 +101,7 @@
          </el-button> -->

          <el-button
          v-if="permissions.manufacturingorder_export"
            @click="exportExcel"
            type="primary"
            style="margin-left:10px;"
@@ -108,6 +109,7 @@
            >导出
          </el-button>
          <el-button
          v-if="permissions.manufacturingorder_label_print"
            @click="labelPrint"
            type="primary"
            style="margin-left:10px;"
@@ -210,7 +212,7 @@
          <el-checkbox-group @change="changePrintCode()" v-model="checkIndexList">
            <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
                  <el-checkbox :label="i" :key="i" style="position: relative;top:-20px;left:5px"><br></el-checkbox>
                  <el-row>
                  <!-- <el-row>
                    <el-col :span="10" :offset="3">批次号</el-col>
                    <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
                  </el-row>
@@ -231,7 +233,28 @@
                    <el-col :span="10">
                      <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
                    </el-col>
                  </el-row>
                  </el-row> -->
                   <div style="display: flex;">
                      <div>
                        <el-col :span="8" :offset="2">
                          <vueQr :text="JSON.stringify(item.code)" :size="120" :margin="2"></vueQr>
                        </el-col>
                      </div>
                      <div style="margin-left: 20px;width: 100%;">
                        <el-row >
                          <el-col  style="font-weight: bold;"><span>批次号:&nbsp; </span>{{ item.code.moNo2 }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 5px;">
                          <el-col  style="font-weight: bold;"><span>订单号:&nbsp; </span>{{ item.orderNo }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 5px;">
                          <el-col  style="font-weight: bold;"><span>客户名称:&nbsp; </span>{{ item.cName }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 5px;">
                          <el-col  style="font-weight: bold;">{{ item.pName }}</el-col>
                        </el-row>
                      </div>
                  </div>
            </el-card>
          </el-checkbox-group>
        </div>
@@ -241,9 +264,9 @@
        <el-button type="primary" @click="printFun">打 印</el-button>
      </span>
    </el-dialog>
    <div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;padding: 0;">
    <div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;margin-top: 0;">
        <div id="printMOrder">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="padding-top:0px;margin-bottom:10px;font-size: 16px !important;">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="margin-top-top:0px;margin-bottom:10px;font-size: 16px !important;">
            <el-row style="font-size:12px;">
              <el-col :span="10" :offset="3">批次号</el-col>
              <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
@@ -996,21 +1019,6 @@
  },
  created() {
    this.getManufactureAttrs()
    /**
 * {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          },
          {
            text: '按客户订单查询',
            fun: this.getOperationTaskByCustomer
          },
          {
            text: '订单合并',
            fun: this.openOrderMerge
          }
 */
    if (this.permissions.plan_manufacturingorder_add) {
      this.table.toolbar.push({
        text: '新增',
@@ -1024,28 +1032,6 @@
        fun: this.getOperationTaskByCustomer
      })
    }
    // if (this.permissions.manufacturingorder_order_merge) {
    //   this.table.toolbar.push({
    //     text: '订单合并',
    //     fun: this.openOrderMerge
    //   })
    // }

    /**
     * {
          label: '手动新增',
          command: 'MANUAL',
          disabled: false,
          permitArr: ['01planned', '02issued']
        },
        {
          label: '自动新增',
          command: 'AUTO',
          disabled: false,
          permitArr: ['01planned', '02issued']
        }
     */

    if (this.permissions.manufacturingorder_create_task_manual) {
      this.taskTypeArr.push({
        label: '手动新增',
@@ -1062,21 +1048,7 @@
        permitArr: ['01planned', '02issued']
      })
    }
    // 初始化queryParam
    // this.initSearchCondition()
    // if (!this.options.cancelRunCreated) {
    //   this.getDataList()
    // }
    // const queryParam = []
    //       queryParam.push(
    //         Object.assign({
    //           prop: 'state',
    //           searchInfoType: 'select',
    //           propVal: '01planned'
    //         })
    //       )
    //   this.$refs.manufacturingOrderTable.setQueryParam(queryParam)
    //   this.getData()

    this.getBomTypeDbOptions()

    // 车间订单是否同步IFS
@@ -1280,6 +1252,10 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.plan_manufacturingorder_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$router.push({
        name: 'productorderForm',
        query: { id: row == null ? null : row.id }