1.连接自动打印,2.修改bug

loulijun2021

2022-07-15 869f6c069e86c2ff90393c1441854a6f05989481

 src/views/zzmx/gxdy.vue

@@ -17,7 +17,7 @@
              <el-input v-model="form.stepname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="启用状态" style=" display: flex;">
              <el-select v-model="form.enable" :popper-append-to-body="false" style="width: 200px" placeholder="请选择">
              <el-select v-model="form.enable" filterable :popper-append-to-body="false" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in enableArr"
                  :key="item.code"
@@ -29,6 +29,7 @@
            <el-form-item label="工序类型" style=" display: flex;">
              <el-select
                v-model="form.steptypecode"
                filterable
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
@@ -54,7 +55,7 @@
      <el-divider />
      <div style="margin-left: 10px;display: flex">
        <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>
        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
      </div>
      <el-divider />
      <div class="elTableDiv">
@@ -122,6 +123,7 @@
          <el-table-column
            prop="lm_date"
            label="创建时间"
            width="160"
            sortable="custom"
          />
          <el-table-column
@@ -147,7 +149,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
@@ -169,9 +171,9 @@

    <!--新增修改对话框-->
    <el-dialog
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      width="800px"
      :close-on-click-modal="false"
      top="15vh"
      @closed="handleClose"
@@ -179,15 +181,16 @@
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <el-form-item label="工序编码" prop="stepcode">
          <el-input v-model="dialogForm.stepcode" :disabled="operation!=='add'" style="width: 220px" />
          <el-input v-model="dialogForm.stepcode" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="工序名称" prop="stepname">
          <el-input v-model="dialogForm.stepname" style="width: 220px" />
          <el-input v-model="dialogForm.stepname" style="width: 200px" />
        </el-form-item>
        <el-form-item prop="steptypecode" label="工序类型">
          <el-select
            v-model="dialogForm.steptypecode"
            style="width: 220px"
            filterable
            style="width: 200px"
            placeholder="请选择"
            :popper-append-to-body="false"
          >
@@ -202,7 +205,8 @@
        <el-form-item prop="enable" label="启用状态">
          <el-select
            v-model="dialogForm.enable"
            style="width: 220px"
            filterable
            style="width: 200px"
            placeholder="请选择"
            :popper-append-to-body="false"
          >
@@ -215,7 +219,7 @@
          </el-select>
        </el-form-item>
        <el-form-item label="工序描述" prop="description">
          <el-input v-model="dialogForm.description" type="textarea" style="width: 220px" />
          <el-input v-model="dialogForm.description" type="textarea" style="width: 200px" />
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
@@ -232,6 +236,7 @@
      :visible.sync="workDialogVisible"
      width="50%"
      top="15vh"
      :fullscreen="isFullscreen"
      :close-on-click-modal="false"
      class="workDialogVisible"
      @closed="workHandleClose"
@@ -278,6 +283,7 @@
          :data="workDialogForm.workTreeArr"
          show-checkbox
          node-key="code"
          style="height: 300px;"
          default-expand-all
          :props="workTreeDefaultProps"
          @check="checkBoxClick"
@@ -299,6 +305,7 @@
      :visible.sync="defectDialogVisible"
      width="50%"
      top="15vh"
      :fullscreen="isFullscreen"
      :close-on-click-modal="false"
      class="defectDialogVisible"
      @closed="defectHandleClose"
@@ -319,7 +326,7 @@
          :data="defectTree"
          show-checkbox
          node-key="code"
          style="height: 400px;"
          style="height: 500px;"
          default-expand-all
          :props="workTreeDefaultProps"
        />
@@ -354,7 +361,7 @@

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: 'Zzjg',
  name: 'GXDY',
  components: {
    Pagination
  },
@@ -371,6 +378,7 @@
      }
    }
    return {
      isFullscreen: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -390,8 +398,8 @@
      ],
      steptypeArr: [
        { code: 'Z', name: '自制' },
        { code: 'W', name: '外协' },
        { code: 'Z;W', name: '自制；外协' }
        { code: 'W', name: '外协' }
        // { code: 'Z;W', name: '自制；外协' }
      ],
      total: 10,
      tableData: [],
@@ -564,6 +572,10 @@
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        // this.isFullscreen = window.innerHeight < 800
        if (window.innerHeight < 800) {
          this.tableHeight = this.tableHeight - 50
        }
      })
    },
    /* 关联工作站模块*/