Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-10-14 6ac9391135ded7e668d2d42f408f4a6c59b27d23

 north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue

@@ -53,7 +53,7 @@
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 50},//鼠标移动或选择高亮
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  showFooter: true,//显示脚
  printConfig: {},
@@ -155,7 +155,9 @@
      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input type="text" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
            <input type="text" v-model="option.data"
                   @keyup.enter.native="$panel.confirmFilter()"
                   @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
      </template>
@@ -163,15 +165,15 @@

    </vxe-grid>

    <el-dialog v-model="dialogFormVisible" title="设备编辑">
    <el-dialog v-model="dialogFormVisible" :title="$t('machine.deviceEditing')">
      <el-form :model="form">
        <el-form-item label="标准名称" :label-width="formLabelWidth">
        <el-form-item :label="$t('machine.standardName')" :label-width="formLabelWidth">
          <el-input v-model="form.name"  autocomplete="off"  style="width: 220px"/>
        </el-form-item>
        <el-form-item label="设备名称" :label-width="formLabelWidth">
        <el-form-item :label="$t('machine.basicName')" :label-width="formLabelWidth">
          <el-input v-model="form.name"  autocomplete="off"  style="width: 220px"/>
        </el-form-item>
        <el-form-item label="购买时间" :label-width="formLabelWidth">
        <el-form-item :label="$t('machine.purchaseTime')" :label-width="formLabelWidth">
          <el-date-picker
              v-model="value1"
              type="date"
@@ -179,7 +181,7 @@
              :size="size"
          />
        </el-form-item>
        <el-form-item label="安装时间" :label-width="formLabelWidth">
        <el-form-item :label="$t('machine.installationTime')" :label-width="formLabelWidth">
          <el-date-picker
              v-model="value1"
              type="date"
@@ -187,22 +189,22 @@
              :size="size"
          />
        </el-form-item>
        <el-form-item label="保养周期" :label-width="formLabelWidth">
        <el-form-item :label="$t('machine.maintenanceCycle')" :label-width="formLabelWidth">
          <el-input v-model="form.name"  autocomplete="off"  style="width: 220px"/>
        </el-form-item>
        <el-form-item label="所在工艺" :label-width="formLabelWidth">
          <el-select v-model="form.region" placeholder="钢化" style="width: 220px">
            <el-option label="切割" value="shanghai" />
            <el-option label="磨边" value="mobian" />
            <el-option label="钢化" value="ganghua" />
        <el-form-item :label="$t('machine.standardName')" :label-width="formLabelWidth">
          <el-select v-model="form.region" :placeholder="$t('machine.tempering')" style="width: 220px">
            <el-option :label="$t('machine.cutting')" value="shanghai" />
            <el-option :label="$t('machine.edgeGrinding')" value="mobian" />
            <el-option :label="$t('machine.tempering')" value="ganghua" />
          </el-select>
        </el-form-item>
      </el-form>
      <template #footer>
      <span class="dialog-footer">
        <el-button @click="dialogFormVisible = false">取消</el-button>
        <el-button @click="dialogFormVisible = false">{{$t('basicData.cancelButtonText')}}</el-button>
        <el-button type="primary" @click="dialogFormVisible = false">
          确认
          {{$t('basicData.confirmButtonText')}}
        </el-button>
      </span>
      </template>