1.字体引入研究2.节拍工价、工单新增控制必须设置计件单价

loulijun2021

2023-03-03 0fe5b8389c7025ce34a05d3920d1d6c169f9fea7

 src/views/zzmx/jpgj.vue

@@ -2,18 +2,18 @@
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">

      <div class="bodyTopButtonGroup">
        <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 class="bodyTopButtonGroup" style="justify-content: space-between">
        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button v-waves icon="el-icon-download" @click="upload">导入</el-button>
      </div>

      <div class="bodyTopFormGroup">
        <el-form
          ref="form"
          :model="form"
          label-width="80px"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="产品名称" style=" display: flex;">
@@ -88,15 +88,20 @@
              </el-select>
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <el-button v-waves type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
        </el-form>
        <div
          class="bodyTopFormExpand"
        />
      </div>

      <div class="elTableDiv">
        <el-table
          ref="tableDataRef"
          class="tableFixed"
          :data="tableData"
          :height="tableHeight"
          border
@@ -120,12 +125,14 @@
          <el-table-column
            prop="partcode"
            min-width="160"
            show-tooltip-when-overflow
            label="产品编码"
            sortable="custom"
          />
          <el-table-column
            prop="partname"
            label="产品名称"
            show-tooltip-when-overflow
            min-width="160"
            sortable="custom"
          />
@@ -134,46 +141,69 @@
            label="产品规格"
            min-width="110"
            sortable="custom"
          />
            show-tooltip-when-overflow
          >
            <template slot-scope="{row}">
              <div v-if="row.partspec">{{ row.partspec }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="wksp_name"
            label="生产车间"
            min-width="110"
            sortable="custom"
            show-tooltip-when-overflow
          />
          <el-table-column
            prop="route_name"
            label="工艺路线"
            sortable="custom"
            min-width="120"
            show-tooltip-when-overflow
          />
          <el-table-column
            prop="stepname"
            label="加工工序"
            sortable="custom"
            min-width="110"
            show-tooltip-when-overflow
          />
          <el-table-column
            prop="eqp_name"
            label="加工设备"
            show-tooltip-when-overflow
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="eqp_value"
            label="设备节拍"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          />
          >
            <template slot-scope="{row}">
              <div v-if="row.eqp_value">{{ row.eqp_value }} <span style="margin-left: 2px">秒</span></div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="stand_value"
            label="生产节拍"
            width="110"
            show-tooltip-when-overflow
            sortable="custom"
          />
          >
            <template slot-scope="{row}">
              <div v-if="row.stand_value">{{ row.stand_value }} <span style="margin-left: 2px">秒</span></div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="cavity_qty"
            label="型腔数"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          />
@@ -181,6 +211,7 @@
            prop="unprice"
            width="110"
            label="计件单价"
            show-tooltip-when-overflow
            sortable="custom"
          />

@@ -192,10 +223,10 @@
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                  <i class="el-icon-edit-outline" @click="edit('edit',row)" />
                  <i :style="{color:$store.state.settings.theme}" class="el-icon-edit-outline" @click="edit('edit',row)" />
                </el-tooltip>
                <el-tooltip v-del-tab-index class="item" effect="dark" content="编辑" placement="top">
                  <i class="el-icon-delete" @click="del(row)" />
                <el-tooltip v-del-tab-index class="item" effect="dark" content="删除" placement="top">
                  <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
                </el-tooltip>
              </div>
            </template>
@@ -204,18 +235,18 @@
      </div>
      <!--分页-->
      <pagination
        v-show="total>0"
        :total="total"
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getBeatRateSearch"
      />
    </div>

    <el-dialog
      v-el-drag-dialog
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="1000px"
@@ -226,7 +257,7 @@
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <div style="display: flex;align-items: center">
          <i class="el-icon-s-comment" style="color:#42b983;margin-top: -20px" />
          <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" style="margin-top: -20px" />
          <el-form-item prop="partcode" label="产品名称">
            <el-select
              v-show="operation==='add'"
@@ -235,7 +266,6 @@
              style="width: 220px"
              placeholder="请选择"
              :popper-append-to-body="false"

              @change="partDialogChange"
            >
              <!--              @focus="getPartSelect2"-->
@@ -282,7 +312,7 @@
      </el-form>
      <div style="display: flex;flex-direction: column;margin-bottom: 20px">
        <div>
          <i class="el-icon-s-operation" style="color:#42b983;margin: -20px 10px 20px 0" />工序集合
          <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 20px 0" />工序集合
        </div>
        <div style="display: flex;background-color: #F2F6FC;padding:20px 0  20px 20px; min-height: 100px">
          <el-radio-group v-model="dialogForm.stepcode" @change="radioChange">
@@ -299,20 +329,24 @@

      <div style="display: flex;flex-direction: column;min-height: 300px">
        <div>
          <i class="el-icon-s-operation" style="color:#42b983;margin: -20px 10px 20px 0" />设备列表
          <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 20px 0" />设备列表
        </div>

        <el-table
          ref="eqpDialogArrRef"
          :key="tableTimeStampKey"
          class="tableFixed"
          :data="eqpDialogArr"
          :height="tableHeight"
          :style="{width: 100+'%',height:tableHeight-50+'px',}"
          :style="{width: 100+'%',height:tableHeight-50+'px'}"
          border
          :row-class-name="tableRowClassName"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          highlight-current-row
          @sort-change="dialogSortChange"
        >
          <!--          @row-click="rowClick"-->
          <el-table-column
            width="50"
            label="序号"
@@ -323,24 +357,28 @@
            prop="eqpcode"
            label="设备编码"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="110"
          />
          <el-table-column
            prop="eqpname"
            label="设备名称"
            min-width="110"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="wksp_name"
            sortable="custom"
            label="生产车间"
            show-tooltip-when-overflow
            min-width="110"
          />
          <el-table-column
            sortable="custom"
            prop="eqp_value"
            label="设备节拍"
            show-tooltip-when-overflow
            width="110"
          >
            <template slot-scope="{row}">
@@ -408,10 +446,10 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button v-if="row.isVisible===1" type="text" @click="saveRow(row)">保存</el-button>
                <el-button v-if="row.isVisible===1" type="text" @click="cancelRow(row)">取消</el-button>
                <el-button v-if="row.isVisible===0" type="text" @click="editRow(row)">编辑</el-button>
                <el-button v-if="row.isVisible===0" type="text" @click="copyRow(row)">复制</el-button>
                <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveRow(row)">保存</el-button>
                <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancelRow(row)">取消</el-button>
                <el-button v-if="row.isVisible===0" v-waves type="text" @click="editRow(row)">编辑</el-button>
                <el-button v-if="row.isVisible===0" v-waves type="text" @click="copyRow(row)">复制</el-button>
              </div>
            </template>
          </el-table-column>
@@ -424,7 +462,7 @@
          :limit.sync="eqpTable.rows"
          align="right"
          style="padding-top: 20px;"
          layout="prev, pager, next,sizes"
          layout="total,prev, pager, next,sizes"
          popper-class="select_bottom"
          @pagination="getEqpTable"
        />
@@ -433,12 +471,22 @@

      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="dialogVisibleCancel">返 回</el-button>
          <!--          <el-button @click="dialogVisibleCancel">取 消</el-button>-->
          <!--          <el-button type="primary" @click="dialogVisibleConfirm">确 定</el-button>-->
          <el-button v-waves @click="dialogVisibleCancel">返 回</el-button>
          <!--          <el-button v-waves @click="dialogVisibleCancel">取 消</el-button>-->
          <!--          <el-button v-waves type="primary" @click="dialogVisibleConfirm">确 定</el-button>-->
        </div>
      </span>
    </el-dialog>

    <!--导入组件-->
    <import-picker
      ref="importPickerFunc"
      class="importPickerClass"
      :shows.sync="shows"
      :title="title_value"
      :colos="colos"
      :code="code"
    />
  </div>
</template>

@@ -452,32 +500,17 @@
  StepSelectEqp,
  StepSelectEqpList
} from '@/api/zzmx'
import ImportPicker from '@/components/ImportPicker'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: 'JPGJ',
  components: {
    Pagination
    Pagination, ImportPicker
  },
  directives: { elDragDialog, waves },
  data() {
    const validateName = (rule, value, callback) => {
      if (!value) {
        return callback(new Error('请输入编码'))
      } else {
        if (SER_HZ.test(value)) {
          return callback(new Error('编码不能为中文'))
        } else {
          callback()
        }
      }
    }
    const validateTypeCode = (rule, value, callback) => {
      if (!value) {
        return callback(new Error('请选择上级'))
      } else {
        callback()
      }
    }
    return {
      isIpad: false,
      mainHeight: 0,
@@ -529,21 +562,21 @@
      editRouteName: '', // 编辑时工艺路线名称
      editStepName: '', // 编辑时加工工序名称
      operation: '',
      dialogFormRules: {
        OrgType: [
          { required: true, message: '请输入选择类型', trigger: ['blur', 'change'] }
        ],
        OrgCode: [
          { required: true, validator: validateName, trigger: ['blur', 'change'] }
        ],
        OrgName: [
          { required: true, message: '请输入名称', trigger: ['blur', 'change'] }
        ],
        SupUnit: [
          { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
        ]
      }
      dialogFormRules: {},
      radioChangeTempValue: '',

      tableTimeStampKey: new Date().getTime(),

      title_value: '数据导入 / 节拍工价',
      code: '24',
      shows: false
    }
  },
  watch: {
    shows() {
      if (!this.shows) {
        this.getBeatRateSearch()
      }
    }
  },
  created() {
@@ -627,15 +660,18 @@
      this.routeDialogArr = res
      this.stepDialogArr = []
      this.eqpDialogArr = []
      this.dialogForm.routecode = ''
    },
    async routeDialogChange(val) {
      const { data: res } = await RouteSelectStep({ routecode: val })
      this.stepDialogArr = res
      this.eqpDialogArr = []
      this.radioChangeTempValue = ''
    },
    radioChange(val) {
      this.isEqpTableEdit = true

      this.radioChangeTempValue = val
      // this.dialogForm.stepcode = this.stepDialogArr.find(item => item.name === val).code
      this.getEqpTable(val)
    },
@@ -656,12 +692,14 @@
        this.eqpTable.partcode = this.dialogForm.partcode
        this.eqpTable.routecode = this.dialogForm.routecode
        this.eqpTable.stepcode = this.stepDialogArr.find(item => item.name === val).code
      } else if (typeof val === 'number') {
      // } else if (typeof val === 'number') {
      } else {
        this.eqpTable.partcode = this.dialogForm.partcode
        this.eqpTable.routecode = this.dialogForm.routecode
        this.eqpTable.stepcode = this.stepDialogArr[0].code
        this.dialogForm.stepcode = this.stepDialogArr[0].name
      }

      const res = await StepSelectEqpList(this.eqpTable)
      this.eqpDialogArr = res.data
      this.eqpTableLength = res.count
@@ -669,9 +707,14 @@
      this.eqpDialogArr.forEach(item => {
        item.isVisible = 0
      })
      this.$refs.tableDataRef.doLayout()
    },
    // 保存行
    async saveRow(row) {
      if (parseFloat(row.unprice) <= 0) {
        return this.$message.info('计件单价必须大于零！')
      }

      const data = {
        partcode: this.eqpTable.partcode, //  产品编码
        routecode: this.eqpTable.routecode, //  工艺路线编码
@@ -689,25 +732,43 @@
      if (res.code === '200') {
        this.isEqpTableEdit = true
        this.$message.success('保存成功！')
        await this.getEqpTable()
        this.radioChange(this.radioChangeTempValue)
      }
    },
    // 取消行
    cancelRow(row) {
      this.getEqpTable()

      this.radioChange(this.radioChangeTempValue)
      this.dialogForm.stepcode = this.radioChangeTempValue

      this.isEqpTableEdit = true
    },
    // 编辑行
    editRow(row) {
      if (this.isEqpTableEdit) {
        row.isVisible = 1
        let temp = {}
        this.eqpDialogArr.forEach((item, index) => {
          if (row.eqpcode === item.eqpcode) {
            temp = item
            this.eqpDialogArr.splice(index, 1, temp)
            this.eqpDialogArr[index].isVisible = 1
          }
        })
        this.isEqpTableEdit = false
        this.tableTimeStampKey = new Date().getTime()
      } else {
        return this.$message.info('只能一行一行修改！')
      }
    },
    // rowClick(row, column, event) {
    //   console.log(row, column, event, 3)
    //   console.log(this.dialogForm.stepcode, 4)
    //   this.getEqpTable(this.dialogForm.stepcode)
    // },
    // 复制行
    async  copyRow(row) {
    async copyRow(row) {
      let currentData = {}// 当前行对象
      let nextData = {}// 下一行对象
      if (row.RowNum === this.eqpDialogArr.length) {
@@ -735,7 +796,7 @@
      const res = await SaveBeatRate(newData)
      if (res.code === '200') {
        this.$message.success('复制成功！')
        await this.getEqpTable()
        this.radioChange(this.radioChangeTempValue)
        this.isEqpTableEdit = true
      }
    },
@@ -762,7 +823,7 @@
      this.getPartSelect2()
    },
    // 修改按钮
    async  edit(operation, row) {
    async edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true

@@ -770,13 +831,11 @@
      this.editRouteName = row.route_name
      this.editStepName = row.stepname

      // this.$nextTick(() => {
      await this.partDialogChange(row.partcode)
      await this.routeDialogChange(row.route_code)
      this.dialogForm.partcode = row.partcode
      this.dialogForm.routecode = row.route_code
      this.dialogForm.stepcode = row.stepcode
      // })
      await this.partDialogChange(row.partcode)
      await this.routeDialogChange(row.route_code)
      await this.radioChange(0)
    },
    // 删除按钮
@@ -795,6 +854,9 @@
        DeleteBeatRate(data).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            if (this.form.page > 1 && this.tableData.length === 1) {
              this.form.page--
            }
            this.getBeatRateSearch()
          }
        })
@@ -846,15 +908,24 @@
    //     }
    //   })
    // },
    // 导入按钮
    upload() {
      this.shows = true
      this.$refs.importPickerFunc.newDataFunc()
    },
    colos() {
      this.shows = false
    },
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 200
        this.tableHeight = this.mainHeight - 195
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 40
        }
        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
        this.$refs.tableDataRef.doLayout()
      })
    }
  }
@@ -864,15 +935,17 @@
<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;
.el-button--text{
.el-button--text {
  font-size: 14px;
  cursor: pointer;
}
.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{

.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
  color: $main_color;
  cursor: pointer;
}
.el-icon-edit-outline{

.el-icon-edit-outline {
  margin-right: 15px;
}

@@ -933,8 +1006,8 @@
  background-color: #f8f8fa;
}

::v-deep .el-table__body .el-table__row.hover-row td{
  background-color: #eaecef ;
::v-deep .el-table__body .el-table__row.hover-row td {
  background-color: #eaecef;
}

::v-deep .el-form--inline .el-form-item__label {
@@ -950,10 +1023,20 @@
.body ::v-deep .el-form-item {
  margin-bottom: 0;
}

.userDialogVisible ::v-deep .el-form-item {
  margin-bottom: 0;
}

.tableFixed {
  ::v-deep .el-table__fixed-right {
    height: 100% !important;
  }

  ::v-deep .el-table__fixed {
    height: 100% !important;
  }
}
</style>
<style>