1.制造模型引入车间概念

loulijun2021

2023-06-16 db407663e3024050ab3eb701f10ee00ddaf5f1ee

1.制造模型引入车间概念

 src/api/basicSettings.js

@@ -77,9 +77,9 @@
  })
}
// 用户清单关联角色保存
export function SaveUserAssoctRole(data, usercode, stu_torgcode) {
export function SaveUserAssoctRole(data, usercode, stu_torgcode, description) {
  return request({
    url: 'BasicSetting/SaveUserAssoctRole?usercode=' + usercode + '&stu_torgcode=' + stu_torgcode,
    url: 'BasicSetting/SaveUserAssoctRole?usercode=' + usercode + '&stu_torgcode=' + stu_torgcode + '&description=' + description,
    method: 'post',
    data
  })

 src/api/makeModel.js

@@ -189,9 +189,9 @@
}

// 工序定义关联工作站提交
export function SaveStepAssociationEqp(stepcode, data) {
export function SaveStepAssociationEqp(stepcode, WorkShop, data) {
  return request({
    url: 'ProductModel/SaveStepAssociationEqp?stepcode=' + stepcode,
    url: 'ProductModel/SaveStepAssociationEqp?stepcode=' + stepcode + '&WorkShop=' + WorkShop,
    method: 'post',
    data
  })
@@ -207,9 +207,9 @@
}

// 工序关联缺陷提交
export function SaveStepAssociationDefect(stepcode, data) {
export function SaveStepAssociationDefect(stepcode, WorkShop, data) {
  return request({
    url: 'ProductModel/SaveStepAssociationDefect?stepcode=' + stepcode,
    url: 'ProductModel/SaveStepAssociationDefect?stepcode=' + stepcode + '&WorkShop=' + WorkShop,
    method: 'post',
    data
  })
@@ -295,10 +295,11 @@
}

// 工艺路线工艺设置下拉
export function StepSelect() {
export function StepSelect(data) {
  return request({
    url: 'ProductModel/StepSelect',
    method: 'get'
    method: 'get',
    params: data
  })
}


 src/components/RightPanel/index.vue

@@ -42,11 +42,11 @@
      if (value && !this.clickNotClose) {
        this.addEventClick()
      }
      if (value) {
        addClass(document.body, 'showRightPanel')
      } else {
        removeClass(document.body, 'showRightPanel')
      }
      // if (value) {
      //   addClass(document.body, 'showRightPanel')
      // } else {
      //   removeClass(document.body, 'showRightPanel')
      // }
    }
  },
  mounted() {

 src/views/basicSettings/userList.vue

@@ -973,6 +973,7 @@
      dialogVisibleRoles: false,
      dialogFormRoles: {
        stu_torgcode: '', // 所属组织
        description: '', // 所属组织类型
        username: '', // 用户名称
        usercode: '', // 用户编码
        rolesArr: [], // 角色类型集合
@@ -1243,11 +1244,13 @@

      this.dialogFormRoles.rolesArrSelectedArr = []
      this.dialogFormRoles.rolesArr = []
      this.dialogFormRoles.roleTree = []
      this.dialogFormRoles.roleTreeSelectedArr = []

      this.dialogFormRoles.username = row.username
      this.dialogFormRoles.usercode = row.usercode
      this.dialogFormRoles.stu_torgcode = row.stu_torgcode
      this.dialogFormRoles.description = row.description
      UserAssociationRole({ usercode: row.usercode, stu_torgcode: row.stu_torgcode, description: row.description }).then(res => {
        if (res.code === '200') {
          setTimeout(() => {
@@ -1311,7 +1314,10 @@
    // 用户关联对话框确认事件
    async rolesDialogVisibleConfirm() {
      this.$store.state.app.buttonIsDisabled = true
      const res = await SaveUserAssoctRole(this.dialogFormRoles.roleTreeSelectedArr, this.dialogFormRoles.usercode, this.dialogFormRoles.stu_torgcode)
      this.dialogFormRoles.roleTreeSelectedArr.forEach(i => {
        i.Data = [...new Set(i.Data)]
      })
      const res = await SaveUserAssoctRole(this.dialogFormRoles.roleTreeSelectedArr, this.dialogFormRoles.usercode, this.dialogFormRoles.stu_torgcode, this.dialogFormRoles.description)
      if (res.code === '200') {
        this.dialogVisibleRoles = false
        this.$message.success('保存成功！')
@@ -1375,12 +1381,17 @@
              } else {
                this.dialogFormRoles.roleTreeSelectedArr.forEach((i, ind) => { // 当选子code时执行
                  if (i.Code === checkedFatherCode) {
                    let flag = true
                    this.dialogFormRoles.roleTreeSelectedArr[ind].Data.forEach((i1, ind2) => {
                      if (i1 === a[0]) {
                        // this.dialogFormRoles.roleTreeSelectedArr[ind].Data.splice(ind2, 1)// 当子code与现在的code相同时执行
                        this.dialogFormRoles.roleTreeSelectedArr[ind].Data = this.dialogFormRoles.roleTreeSelectedArr[ind].Data.filter(i2 => i2 !== a[0])
                        flag = false
                      } else {
                        this.dialogFormRoles.roleTreeSelectedArr[ind].Data.push(a[0])// //当子code与现在的code不相同时执行
                        if (flag) {
                          console.log('执行了')
                          this.dialogFormRoles.roleTreeSelectedArr[ind].Data.push(a[0])// //当子code与现在的code不相同时执行
                        }
                      }
                    })
                    // this.dialogFormRoles.roleTreeSelectedArr[ind].Data.filter((i1, ind2) => i1 !== a[0])// 过滤掉选中相同的

 src/views/deviceManager/checkRecord.vue

@@ -20,9 +20,9 @@
              <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in wkshopSelectArr"
                  :key="item.org_code"
                  :label="item.org_name"
                  :value="item.org_code"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </el-form-item>
@@ -265,8 +265,12 @@
import { getCookie } from '@/utils/auth'
import ImportPicker from '@/components/ImportPicker'
import { handleDatetime, validateCode } from '@/utils/global'
import { DeviceCheckSubTakeSearch, DeviceCheckTakeOutExcel, DeviceCheckTakeSearch } from '@/api/deviceManager'
import { ShopSearch } from '@/api/kanbanManager'
import {
  DeviceCheckSubTakeSearch,
  DeviceCheckTakeOutExcel,
  DeviceCheckTakeSearch,
  WorkShopSelect
} from '@/api/deviceManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
@@ -284,7 +288,7 @@
      mainHeight: 0,
      tableHeight: 0,
      form: {
        wkshopcode: '', // 车间编码
        wkshopcode: this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode'), // 所属车间
        eqpcode: '', // 设备编码
        eqpname: '', // 设备名称
        stanedname: '', // 标准名称
@@ -473,7 +477,7 @@
    },
    // 获取执行车间下拉数组
    async getShopSearch() {
      const { data: res } = await ShopSearch()
      const { data: res } = await WorkShopSelect()
      this.wkshopSelectArr = res
    },
    // 排序改变时
@@ -503,7 +507,7 @@
    },
    // 重置
    reset() {
      this.form.wkshopcode = ''
      this.form.wkshopcode = this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode') // 所属车间
      this.form.eqpcode = ''
      this.form.eqpname = ''
      this.form.stanedname = ''

 src/views/deviceManager/maintainRecord.vue

@@ -20,9 +20,9 @@
              <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in wkshopSelectArr"
                  :key="item.org_code"
                  :label="item.org_name"
                  :value="item.org_code"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </el-form-item>
@@ -254,9 +254,9 @@
import { getCookie } from '@/utils/auth'
import ImportPicker from '@/components/ImportPicker'
import { handleDatetime } from '@/utils/global'
import { DeviceRepairSubTakeSearch, DeviceRepairTakeOutExcel, DeviceRepairTakeSearch
import {
  DeviceRepairSubTakeSearch, DeviceRepairTakeOutExcel, DeviceRepairTakeSearch, WorkShopSelect
} from '@/api/deviceManager'
import { ShopSearch } from '@/api/kanbanManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
@@ -274,7 +274,7 @@
      mainHeight: 0,
      tableHeight: 0,
      form: {
        wkshopcode: '', // 车间编码
        wkshopcode: this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode'), // 所属车间
        eqpcode: '', // 设备编码
        eqpname: '', // 设备名称
        stanedname: '', // 标准名称
@@ -492,7 +492,7 @@
    },
    // 获取执行车间下拉数组
    async getShopSearch() {
      const { data: res } = await ShopSearch()
      const { data: res } = await WorkShopSelect()
      this.wkshopSelectArr = res
    },
    // 排序改变时
@@ -522,7 +522,7 @@
    },
    // 重置
    reset() {
      this.form.wkshopcode = ''
      this.form.wkshopcode = this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode') // 所属车间
      this.form.eqpcode = ''
      this.form.eqpname = ''
      this.form.stanedname = ''

 src/views/deviceManager/repairRecord.vue

@@ -14,13 +14,13 @@
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="生产车间"style=" display: flex;">
            <el-form-item label="生产车间" style=" display: flex;">
              <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in wkshopSelectArr"
                  :key="item.org_code"
                  :label="item.org_name"
                  :value="item.org_code"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </el-form-item>
@@ -327,11 +327,12 @@
import Pagination from '@/components/Pagination'
import ImportPicker from '@/components/ImportPicker'
import { handleDatetime } from '@/utils/global'
import { DeviceUpdateOutExcel, DeviceUpdateSearch, DeviceUpdateSubSearch } from '@/api/deviceManager'
import { DeviceUpdateOutExcel, DeviceUpdateSearch, DeviceUpdateSubSearch, WorkShopSelect } from '@/api/deviceManager'
import { ShopSearch } from '@/api/kanbanManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
import { getCookie } from '@/utils/auth'

export default {
  name: 'Zzjg',
@@ -346,7 +347,7 @@
      mainHeight: 0,
      tableHeight: 0,
      form: {
        wkshopcode: '', // 车间编码
        wkshopcode: this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode'), // 所属车间
        eqpcode: '', // 设备编码
        eqpname: '', // 设备名称
        reportuser: '', // 报修人员
@@ -582,7 +583,7 @@
    },
    // 获取执行车间下拉数组
    async getShopSearch() {
      const { data: res } = await ShopSearch()
      const { data: res } = await WorkShopSelect()
      this.wkshopSelectArr = res
    },
    // 排序改变时
@@ -612,7 +613,7 @@
    },
    // 重置
    reset() {
      this.form.wkshopcode = ''
      this.form.wkshopcode = this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode') // 所属车间
      this.form.eqpcode = ''
      this.form.eqpname = ''
      this.form.reportuser = ''

 src/views/makeModel/InventoryList.vue

@@ -218,7 +218,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getInventoryFileSelect"
      />
@@ -615,26 +615,26 @@
        </div>
      </div>

      <el-divider />
      <div>
        <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 默认工艺路线
      </div>
      <div style="margin-top: 20px">
        <el-select
          v-model="defaultroute_code"
          filterable
          style="width: 200px;"
          placeholder="请选择"
          class="defaultroute_code"
        >
          <el-option
            v-for="item in defaultroute_codeArr"
            :key="item.code"
            :label="item.name"
            :value="item.code"
          />
        </el-select>
      </div>
      <!--      <el-divider   />-->
      <!--      <div  >-->
      <!--        <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 默认工艺路线-->
      <!--      </div>-->
      <!--      <div  style="margin-top: 20px">-->
      <!--        <el-select-->
      <!--          v-model="defaultroute_code"-->
      <!--          filterable-->
      <!--          style="width: 200px;"-->
      <!--          placeholder="请选择"-->
      <!--          class="defaultroute_code"-->
      <!--        >-->
      <!--          <el-option-->
      <!--            v-for="item in defaultroute_codeArr"-->
      <!--            :key="item.code"-->
      <!--            :label="item.name"-->
      <!--            :value="item.code"-->
      <!--          />-->
      <!--        </el-select>-->
      <!--      </div>-->
      <el-divider />
      <div style="margin-bottom: 10px">
        <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 工序列表
@@ -976,7 +976,7 @@
        // routeOperationSelectedArr: [] // 工艺路线选中集合数组
      },
      defaultroute_code: '', // 默认工艺路线选中值
      defaultroute_codeArr: '', // 默认工艺路线数组
      defaultroute_codeArr: [], // 默认工艺路线数组
      projectTableData: [], // 设备列表
      isBatchNo: false, // 是否批次管理
      isFifo: false, // 是否先进先出
@@ -1271,7 +1271,8 @@
        background: 'rgba(0, 0, 0, 0.7)'
      })

      this.defaultroute_code = row.default_route
      // this.defaultroute_code = row.default_route
      // this.defaultroute_code = ''
      this.dialogFormRoute.projectCode = row.partcode
      this.dialogFormRoute.projectName = row.partname

@@ -1310,7 +1311,7 @@
              }
            })

            this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.flag === 'Y')
            // this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.flag === 'Y')
          }, 1000)
        } else {
          loading.close()
@@ -1320,7 +1321,7 @@
    // 对话框关闭
    handleCloseRoute() {
      this.dialogFormRoute.routeOperationArr = []
      this.defaultroute_codeArr = []
      // this.defaultroute_codeArr = []
    },
    // 取消
    routeDialogVisibleCancel() {
@@ -1328,20 +1329,26 @@
    },
    // 确定
    async routeDialogVisibleConfirm() {
      console.log(this.defaultroute_code)
      if (this.defaultroute_code === null || this.defaultroute_code === 'null') {
        return this.$message.info('默认工艺路线不能为空！')
      }
      // console.log(this.defaultroute_code)
      // if (this.defaultroute_code === null || this.defaultroute_code === 'null') {
      //   return this.$message.info('默认工艺路线不能为空！')
      // }

      // 提交格式
      const data = []
      this.dialogFormRoute.routeOperationArr.forEach(item => {
        if (item.isSelected2) {
          data.push({ code: item.code, name: item.name })
          data.push({
            code: item.code,
            name: item.name,
            wkshopcode: item.wkshopcode,
            wkshopname: item.wkshopname
          })
        }
      })
      this.$store.state.app.buttonIsDisabled = true
      const res = await SaveInventoryFile(this.dialogFormRoute.projectCode, this.defaultroute_code, data)
      // const res = await SaveInventoryFile(this.dialogFormRoute.projectCode, this.defaultroute_code, data)
      const res = await SaveInventoryFile(this.dialogFormRoute.projectCode, '', data)
      if (res.code === '200') {
        this.dialogVisibleRoute = false
        this.$message.success('保存成功！')
@@ -1368,10 +1375,11 @@
          item.flag = !item.flag
        }
      })
      if (val.code === this.defaultroute_code) {
        this.defaultroute_code = ''
      }
      this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
      // if (val.code === this.defaultroute_code) {
      //   this.defaultroute_code = ''
      // }
      // this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
      this.$forceUpdate()
    },
    /* 单位模块*/
    // 单位按钮点击事件
@@ -1562,12 +1570,12 @@
  }
}

.defaultroute_code ::v-deep .el-input__suffix-inner {
  display: flex;
  align-items: center;
  justify-content: center;
  margin-top: -3px;
}
//.defaultroute_code ::v-deep .el-input__suffix-inner {
//  display: flex;
//  align-items: center;
//  justify-content: center;
//  margin-top: -3px;
//}
</style>

<!--公共页面样式-->

 src/views/makeModel/materialList.vue

@@ -287,7 +287,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getBoIventorySelect"
      />

 src/views/makeModel/meterPrice.vue

@@ -273,7 +273,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getBeatRateSearch"
      />

 src/views/makeModel/processDefine.vue

@@ -16,27 +16,27 @@
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="工序编码" style=" display: flex;">
              <el-input v-model="form.stepcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="工序名称" style=" display: flex;">
              <el-input v-model="form.stepname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="启用状态" style=" display: flex;">
            <el-form-item label="所属车间" style=" display: flex;">
              <el-select
                v-model="form.enable"
                filterable
                v-model="form.WorkShop"
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
              >
                <!--                @focus="getWareHouseSelect"-->
                <el-option
                  v-for="item in enableArr"
                  v-for="item in WorkShopArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </el-form-item>
            <el-form-item label="工序编码" style=" display: flex;">
              <el-input v-model="form.stepcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="工序名称" style=" display: flex;">
              <el-input v-model="form.stepname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="工序类型" style=" display: flex;">
              <el-select
@@ -48,6 +48,22 @@
              >
                <el-option
                  v-for="item in steptypeArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="启用状态" style=" display: flex;">
              <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"
                  :label="item.name"
                  :value="item.code"
@@ -189,7 +205,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getStepSearch"
      />
@@ -217,7 +233,7 @@
        <el-form-item prop="steptypecode" label="工序类型">
          <el-radio-group
            v-model="dialogForm.steptypecode"
            style="width: 200px"
            style="width: 210px"
          >
            <el-radio
              v-for="item in steptypeArr"
@@ -226,20 +242,22 @@
              :label="item.name"
            />
          </el-radio-group>
          <!--          <el-select-->
          <!--            v-model="dialogForm.steptypecode"-->
          <!--            filterable-->
          <!--            style="width: 200px"-->
          <!--            placeholder="请选择"-->
          <!--            :popper-append-to-body="false"-->
          <!--          >-->
          <!--            <el-option-->
          <!--              v-for="item in steptypeArr"-->
          <!--              :key="item.code"-->
          <!--              :label="item.name"-->
          <!--              :value="item.code"-->
          <!--            />-->
          <!--          </el-select>-->
          <el-form-item prop="wkshopcode" label="所属车间">
            <el-select
              v-model="dialogForm.wkshopcode"
              filterable
              style="width: 200px"
              placeholder="请选择"
              :popper-append-to-body="false"
            >
              <el-option
                v-for="item in WorkShopArr"
                :key="item.code"
                :label="item.name"
                :value="item.code"
              />
            </el-select>
          </el-form-item>
        </el-form-item>
        <el-form-item prop="enable" label="启用状态">
          <el-select
@@ -295,7 +313,7 @@
      <el-divider />
      <div>
        <div style="margin-bottom:20px">
          <i class="el-icon-s-operation":style="{color:$store.state.settings.theme}" /> 工作站集合：
          <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 工作站集合：
        </div>
        <div class="myCheckboxGroup">
          <div
@@ -429,6 +447,8 @@
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
import { getCookie } from '@/utils/auth'
import { WorkShopSelect } from '@/api/deviceManager'

export default {
  name: 'GXDY',
@@ -447,6 +467,7 @@
        stepcode: '', // 工序编码
        stepname: '', // 工序名称
        enable: '', // 启用状态
        WorkShop: this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode'), // 所属车间
        steptypecode: [], // 工序类型编码
        createuser: '', // 创建人员
        prop: 'lm_date', // 排序字段
@@ -463,6 +484,7 @@
        { code: 'W', name: '外协' }
        // { code: 'Z;W', name: '自制；外协' }
      ],
      WorkShopArr: [], // 所属车间数组
      total: 10,
      tableData: [],
      tableColumnSettingsArray: [
@@ -517,13 +539,31 @@
          show: true,
          fixed: false,
          sortable: true
        }, {
          minWidth: 110,
          width: false,
          prop: 'org_code',
          label: '所属组织编码',
          id: 8,
          show: false,
          fixed: false,
          sortable: true
        }, {
          minWidth: 110,
          width: false,
          prop: 'org_name',
          label: '所属车间',
          id: 9,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: false,
          width: 110,
          prop: 'lm_user',
          label: '创建人员',
          id: 8,
          id: 10,
          show: true,
          fixed: false,
          sortable: true
@@ -533,7 +573,7 @@
          width: 160,
          prop: 'lm_date',
          label: '创建时间',
          id: 9,
          id: 11,
          show: true,
          fixed: false,
          sortable: true
@@ -543,7 +583,7 @@
          width: 110,
          prop: 'is_eqp',
          label: '关联工作站',
          id: 10,
          id: 12,
          show: true,
          fixed: false,
          sortable: false
@@ -553,7 +593,7 @@
          width: 110,
          prop: 'is_defect',
          label: '关联缺陷',
          id: 11,
          id: 13,
          show: true,
          fixed: false,
          sortable: false
@@ -568,7 +608,8 @@
        'steptypecode': '自制',
        'enable': 'Y',
        'description': '',
        'OperType': ''
        'OperType': '',
        'wkshopcode': this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode') // 所属车间
      },
      operation: '',
      dialogFormRules: {
@@ -583,12 +624,16 @@
        ],
        enable: [
          { required: true, message: '请选择状态', trigger: ['blur', 'change'] }
        ],
        wkshopcode: [
          { required: true, message: '请选择所属车间', trigger: ['blur', 'change'] }
        ]
      },
      workDialogVisible: false,
      workDialogForm: {
        stepcode: '', // 工序编码
        stepname: '', // 工序名称
        WorkShop: '', // 所属车间
        workArr: [], //  工作站所有数组
        workGatherArr: [], // 工作站集合数组
        workCodeSelectedGatherArr: [], // 工作站选中集合的code数组
@@ -609,12 +654,18 @@
  },
  created() {
    this.getStepSearch()
    this.getWorkShopSelect()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    // 获取所属车间下拉
    async getWorkShopSelect() {
      const { data: res } = await WorkShopSelect()
      this.WorkShopArr = res
    },
    tableColumnUpdate(val, isCopyTrue) {
      if (isCopyTrue) {
        this.tableColumnSettingsArray = val
@@ -657,6 +708,7 @@
      this.form.enable = ''
      this.form.steptypecode = ''
      this.form.createuser = ''
      this.form.WorkShop = this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode')// 所属车间
      this.getStepSearch()
    },

@@ -676,6 +728,7 @@
        this.dialogForm.stepname = row.stepname
        this.dialogForm.steptypecode = this.steptypeArr.find(item => item.code === row.flwtype).name
        this.dialogForm.description = row.descr
        this.dialogForm.wkshopcode = row.org_code
        this.dialogForm.enable = row.enable
      })
    },
@@ -706,6 +759,7 @@
      this.dialogForm.steptypecode = '自制'
      this.dialogForm.enable = 'Y'
      this.dialogForm.description = ''
      this.dialogForm.wkshopcode = this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode')// 所属车间
      this.$refs.dialogForm.clearValidate()
    },
    // 对话框取消
@@ -724,6 +778,7 @@
            steptypecode: this.steptypeArr.find(item => item.name === this.dialogForm.steptypecode).code,
            enable: this.dialogForm.enable,
            description: this.dialogForm.description,
            WorkShop: this.dialogForm.wkshopcode,
            OperType: this.operation === 'add' ? 'Add' : 'Update'
          }
          AddUpdateStep(data).then(res => {
@@ -765,7 +820,8 @@

      this.workDialogForm.stepcode = row.stepcode
      this.workDialogForm.stepname = row.stepname
      StepAssociationEqp({ stepcode: this.workDialogForm.stepcode }).then(res => {
      this.workDialogForm.WorkShop = row.org_code
      StepAssociationEqp({ stepcode: this.workDialogForm.stepcode, WorkShop: row.org_code }).then(res => {
        if (res.code === '200') {
          setTimeout(() => {
            loading.close()
@@ -1049,7 +1105,7 @@
        }
      })
      this.$store.state.app.buttonIsDisabled = true
      const res = await SaveStepAssociationEqp(this.workDialogForm.stepcode, data)
      const res = await SaveStepAssociationEqp(this.workDialogForm.stepcode, this.workDialogForm.WorkShop, data)
      if (res.code === '200') {
        this.workDialogVisible = false
        this.$message.success('保存成功！')
@@ -1070,8 +1126,9 @@

      this.defectTreeCode = row.stepcode
      this.defectTreeName = row.stepname
      this.workDialogForm.WorkShop = row.org_code

      StepAssociationDefect({ stepcode: row.stepcode }).then(res => {
      StepAssociationDefect({ stepcode: row.stepcode, WorkShop: row.org_code }).then(res => {
        if (res.code === '200') {
          setTimeout(() => {
            loading.close()
@@ -1114,7 +1171,7 @@
        }
      })
      this.$store.state.app.buttonIsDisabled = true
      const res = await SaveStepAssociationDefect(this.defectTreeCode, data)
      const res = await SaveStepAssociationDefect(this.defectTreeCode, this.workDialogForm.WorkShop, data)
      if (res.code === '200') {
        this.defectDialogVisible = false
        this.$message.success('保存成功！')

 src/views/makeModel/processRoute.vue

@@ -16,6 +16,22 @@
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="所属车间" style=" display: flex;">
              <el-select
                v-model="form.WorkShop"
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
              >
                <!--                @focus="getWareHouseSelect"-->
                <el-option
                  v-for="item in WorkShopArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </el-form-item>
            <el-form-item label="工艺路线编码" style=" display: flex;">
              <el-input v-model="form.routecode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
@@ -25,7 +41,7 @@
            <el-form-item label="工艺描述" style=" display: flex;">
              <el-input v-model="form.description" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="创建人员" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="创建人员" style=" display: flex;">
              <el-input v-model="form.createuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
@@ -36,7 +52,21 @@
        </el-form>
        <div
          class="bodyTopFormExpand"
        />
        >
          <svg-icon
            v-show="mouseHoverType==='mouseout'"
            style="cursor: pointer"
            :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
            @mouseenter="mouseHoverType=$event.type"
          />
          <svg-icon
            v-show="mouseHoverType==='mouseenter'"
            style="cursor: pointer"
            :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
            @click="isExpandForm=!isExpandForm"
            @mouseout="mouseHoverType=$event.type"
          />
        </div>
      </div>

      <div class="elTableDiv">
@@ -49,10 +79,10 @@
          :key="tableTimeStampKey"
          class="tableFixed"
          :data="tableData"
          :height="tableHeight"
          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
          border
          :row-class-name="tableRowClassName"
          :style="{width: 100+'%',height:tableHeight+'px',}"
          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
@@ -182,7 +212,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getRouteSearch"
      />
@@ -234,10 +264,37 @@
            />
          </el-form-item>
        </div>
        <div style="display: flex">
          <el-form-item prop="wkshopcode" label="所属车间" style="margin-right: 20px">
            <el-select
              v-model="dialogForm.wkshopcode"
              filterable
              :disabled="operation==='edit'"
              :popper-append-to-body="false"
              style="width: 220px"
              placeholder="请选择"
              @change="wkshopcodeChange"
            >
              <el-option
                v-for="item in WorkShopArr"
                :key="item.code"
                :label="item.name"
                :value="item.code"
              />
            </el-select>
          </el-form-item>

        </div>

        <el-form-item label="工艺设置" prop="Data" style="margin-top: 30px">
          <div class="settingDiv">
            <!--   实现工艺设置动态添加-->
            <div v-for="(tag,index) in dynamicTags" :key="tag.seq" style="display: flex;align-items: center">
            <!--            v-if="false"-->
            <div
              v-for="(tag,index) in dynamicTags"
              :key="tag.seq"
              style="display: flex;align-items: center"
            >
              <div style="display: flex;align-items: center;position: relative;">
                <div
                  class="orderNumber"
@@ -349,6 +406,8 @@
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
import { WorkShopSelect } from '@/api/deviceManager'
import { getCookie } from '@/utils/auth'

export default {
  name: 'GYLX',
@@ -359,12 +418,15 @@
  data() {
    return {
      isIpad: false,
      mouseHoverType: 'mouseout',
      isExpandForm: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
        routecode: '', // 工艺路线编码
        routename: '', // 工艺路线名称
        description: '', // 工艺路线描述
        WorkShop: this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode'), // 所属车间
        createuser: '', // 创建人员
        prop: 'lm_date', // 排序字段
        order: 'desc', // 排序字段
@@ -375,6 +437,7 @@
        { label: '是', value: 'Y' },
        { label: '否', value: 'N' }
      ],
      WorkShopArr: [], // 所属车间数组
      total: 10,
      tableData: [],
      tableColumnSettingsArray: [
@@ -423,9 +486,29 @@
        {
          minWidth: 110,
          width: false,
          prop: 'org_code',
          label: '所属车间编码',
          id: 7,
          show: false,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'org_name',
          label: '所属车间',
          id: 8,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'lm_user',
          label: '创建人员',
          id: 7,
          id: 9,
          show: true,
          fixed: false,
          sortable: true
@@ -435,7 +518,7 @@
          width: false,
          prop: 'lm_date',
          label: '创建时间',
          id: 8,
          id: 10,
          show: true,
          fixed: false,
          sortable: true
@@ -449,6 +532,7 @@
        name: '',
        enable: 'Y',
        description: '',
        wkshopcode: this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode'), // 所属车间
        Data: []
      },
      dynamicTags: [// 工艺设置数组
@@ -474,6 +558,9 @@
        ],
        enable: [
          { required: true, message: '请选择使用状态', trigger: ['blur', 'change'] }
        ],
        wkshopcode: [
          { required: true, message: '请选择所属车间', trigger: ['blur', 'change'] }
        ]
        // Data: [
        //   { required: true, message: '请设置工艺', trigger: ['blur', 'change'] }
@@ -484,12 +571,18 @@
  },
  created() {
    this.getRouteSearch()
    this.getWorkShopSelect()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    // 获取所属车间下拉
    async getWorkShopSelect() {
      const { data: res } = await WorkShopSelect()
      this.WorkShopArr = res
    },
    tableColumnUpdate(val, isCopyTrue) {
      if (isCopyTrue) {
        this.tableColumnSettingsArray = val
@@ -513,9 +606,12 @@
        return (res.value.toLowerCase().indexOf(queryString.toLowerCase()) !== -1)
      }
    },
    wkshopcodeChange() {
      this.getStepSelectArr()
    },
    // 工艺设置 下拉获取所有
    async getStepSelectArr() {
      const { data: res } = await StepSelect()
      const { data: res } = await StepSelect({ WorkShop: this.dialogForm.wkshopcode })
      this.routeArr = res
    },
    // 处理下拉选择
@@ -585,6 +681,13 @@
    },
    // tag点击修改按钮
    tagEdit(tag) {
      if (!this.dialogForm.wkshopcode) {
        return this.$message.info('请先选择所属车间！')
      }
      if (this.routeArr.length === 0) {
        return this.$message.info('该车间未设置工序！')
      }

      this.autocompleteValue = ''
      this.dynamicTags.forEach(item => {
        item.stepname = item.stepname.trim()
@@ -731,6 +834,7 @@
      this.form.routename = ''
      this.form.description = ''
      this.form.createuser = ''
      this.form.WorkShop = this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode') // 所属车间
      this.getRouteSearch()
    },

@@ -738,7 +842,10 @@
    add(operation) {
      this.operation = operation
      this.dialogVisible = true
      this.getStepSelectArr()

      if (this.$store.state.settings.orgType === 'W') {
        this.getStepSelectArr()
      }
    },
    // 工艺路线预览
    async edit(operation, row) {
@@ -753,6 +860,8 @@
        this.dialogForm.name = res[0].name
        this.dialogForm.enable = res[0].enable
        this.dialogForm.description = res[0].description
        this.dialogForm.wkshopcode = res[0].wkshopcode

        // this.dialogForm.Data = row.description
        res[0].Data.forEach(item => {
          this.dynamicTags.push(
@@ -786,7 +895,10 @@
      this.operation = operation
      this.dialogVisible = true

      await this.getStepSelectArr()
      if (this.$store.state.settings.orgType === 'W') {
        await this.getStepSelectArr()
      }

      const { data: res } = await ViewRoute({ routecode: row.code })
      // 待改
      this.dynamicTags = []
@@ -796,6 +908,7 @@
        this.dialogForm.name = res[0].name
        this.dialogForm.enable = res[0].enable
        this.dialogForm.description = res[0].description
        this.dialogForm.wkshopcode = res[0].wkshopcode
        res[0].Data.forEach((item, index) => {
          this.dynamicTags.push(
            { seq: item.seq, stepname: item.stepname, stepcode: item.stepcode, editDisabled: true, effect: index === res[0].Data.length - 1 ? 'dark' : 'light' }
@@ -818,6 +931,7 @@
      this.dialogForm.name = ''
      this.dialogForm.enable = 'Y'
      this.dialogForm.description = ''
      this.dialogForm.wkshopcode = this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode'), // 所属车间
      this.dialogForm.Data = []

      this.dynamicTags = [
@@ -859,6 +973,7 @@
            name: this.dialogForm.name,
            enable: this.dialogForm.enable,
            description: this.dialogForm.description,
            wkshopcode: this.dialogForm.wkshopcode,
            Data: Data
          }

@@ -879,7 +994,7 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 195
        this.tableHeight = this.mainHeight - 255
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 40
        }

 src/views/materialManager/locationDefine.vue

@@ -184,7 +184,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getStorageDefSearch"
      />

 src/views/materialManager/storehouseDefine.vue

@@ -156,7 +156,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getWareHouseDefSearch"
      />

 src/views/produceManager/AutoScheduling.vue

@@ -178,7 +178,7 @@
        :page.sync="formTop.page"
        :limit.sync="formTop.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getAdvancedSchedulingSearch"
      />

 src/views/produceManager/capacityPlanning.vue

@@ -181,7 +181,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getCapacityPlanningSearch"
      />

 src/views/produceManager/produceOrder.vue

@@ -335,7 +335,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getErpOrderSearch"
      />

 src/views/produceManager/produceStartOrder.vue

@@ -187,7 +187,7 @@
            :page.sync="form.page"
            :limit.sync="form.rows"
            align="right"
            layout="total,prev, pager, next,sizes"
            layout="total,prev, pager, next,sizes,jumper"
            popper-class="select_bottom"
            @pagination="getMesOrderStepSearch"
          />
@@ -387,7 +387,7 @@
            :page.sync="WXform.page"
            :limit.sync="WXform.rows"
            align="right"
            layout="total,prev, pager, next,sizes"
            layout="total,prev, pager, next,sizes,jumper"
            popper-class="select_bottom"
            @pagination="getMesOrderStepSearch"
          />
@@ -505,7 +505,7 @@
            :page.sync="badForm.page"
            :limit.sync="badForm.rows"
            align="right"
            layout="total,prev, pager, next,sizes"
            layout="total,prev, pager, next,sizes,jumper"
            popper-class="select_bottom"
            @pagination="getBadList"
          />
@@ -784,7 +784,7 @@
            :page.sync="Userform.page"
            :limit.sync="Userform.rows"
            align="right"
            layout="total,prev, pager, next,sizes"
            layout="total,prev, pager, next,sizes,jumper"
            popper-class="select_bottom"
            @pagination="getMesOrderStepSearch"
          />

 src/views/produceManager/workOrder.vue

@@ -362,7 +362,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getMesOrderSearch"
      />
@@ -587,15 +587,33 @@
          <el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
        </el-form-item>
        <div style="display: flex">
          <el-form-item label="生产车间" prop="wkshopcode">
            <el-select
              v-model="dialogForm.wkshopcode"
              filterable
              :popper-append-to-body="false"
              style="width: 200px;"
              placeholder="请选择"
              :disabled="dialogForm.partcode===''"
              @change="val=>wkshopcodeChange(val,dialogForm.partcode)"
            >
              <el-option
                v-for="item in wkshopArr"
                :key="item.org_code"
                :label="item.org_name"
                :value="item.org_code"
              />
            </el-select>
          </el-form-item>
          <div style="display: flex;flex-wrap: nowrap">
            <el-form-item label="工艺路线" prop="routecode">
              <el-select
                v-model="dialogForm.routecode"
                filterable
                :disabled="dialogForm.partcode===''"
                :popper-append-to-body="false"
                style="width: 172px"
                placeholder="请选择"
                :disabled="dialogForm.wkshopcode===''"
                @change="routecodeChange"
              >
                <el-option
@@ -616,24 +634,6 @@
            <!--            :disabled="dialogForm.routecode===''"-->

          </div>
          <el-form-item label="生产车间" prop="wkshopcode">
            <el-select
              v-model="dialogForm.wkshopcode"
              filterable
              :popper-append-to-body="false"
              style="width: 200px;"
              placeholder="请选择"
              :disabled="dialogForm.routecode===''"
              @change="wkshopcodeChange"
            >
              <el-option
                v-for="item in wkshopArr"
                :key="item.org_code"
                :label="item.org_name"
                :value="item.org_code"
              />
            </el-select>
          </el-form-item>
        </div>
        <el-form-item label="是否排程" prop="isAps">
          <el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">
@@ -2338,51 +2338,69 @@
    },
    // 产品信息值改变
    async partcodeChange(val) {
      const { data: res } = await PartSelectRoute({ partcode: val })
      const { data: res } = await RouteSelectWkshop({ partcode: val })
      this.wkshopArr = res

      // this.dialogForm.wkshopcode=res.length === 1?res[0].org_code:''
      if (res.length === 1) {
        this.dialogForm.wkshopcode = res[0].org_code
        await this.wkshopcodeChange(res[0].org_code, val)
      } else {
        this.dialogForm.wkshopcode = ''
      }

      // this.routeArr = res

      // let flag = false
      // this.routeArr.forEach(item => {
      //   if (item.code === item.default_route) {
      //     this.dialogForm.routecode = item.code
      //     // this.routecodeChange(this.dialogForm.routecode)
      //     this.wkshopcodeChange(this.dialogForm.routecode)
      //     flag = true
      //   }
      // })
      // if (!flag) {
      //   this.dialogForm.routecode = ''
      // }
      //
      // this.dialogForm.wkshopcode = ''
      //
      // this.submitButtonIsDisabled = false
    },
    // 工艺路线值改变
    async routecodeChange(partcode, routecode) {
      // const data = {
      //   partcode,
      //   routecode
      // }
    },
    // 生产车间值改变时
    async  wkshopcodeChange(wkshopcode, partcode) {
      const data = {
        partcode,
        wkshopcode
      }

      const { data: res } = await PartSelectRoute(data)
      this.routeArr = res

      let flag = false
      this.routeArr.forEach(item => {
        if (item.code === item.default_route) {
          this.dialogForm.routecode = item.code
          this.routecodeChange(this.dialogForm.routecode)
          flag = true
        }
      })
      if (!flag) {
      if (res.length === 1) {
        this.dialogForm.routecode = res[0].code
      } else {
        this.dialogForm.routecode = ''
      }

      this.dialogForm.wkshopcode = ''

      this.submitButtonIsDisabled = false
    },
    // 工艺路线值改变
    async routecodeChange(val) {
      const data = {
        partcode: this.dialogForm.partcode,
        routecode: this.dialogForm.routecode
      }
      // 获取生产车间数组
      const { data: res2 } = await RouteSelectWkshop(data)
      this.wkshopArr = res2
      this.dialogForm.wkshopcode = ''

      this.submitButtonIsDisabled = false
    },
    // 生产车间值改变时
    wkshopcodeChange(val) {
      const data = {
        partcode: this.dialogForm.partcode,
        routecode: this.dialogForm.routecode,
        wkshopcode: val
      }
      SelectRouteOrWkshop(data).then((res) => {
        // console.log(res, 1)
      }).catch(err => {
        // console.log(err, 2)
        this.submitButtonIsDisabled = true
      })
      // const data = {
      //   partcode: this.dialogForm.partcode,
      //   routecode: this.dialogForm.routecode,
      //   wkshopcode: val
      // }
      // SelectRouteOrWkshop(data).then((res) => {
      //
      // }).catch(err => {
      //   this.submitButtonIsDisabled = true
      // })
    },

    // 是否排程值改变时

 src/views/produceManager/workOrderBatchClose.vue

@@ -361,7 +361,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getMesOrderBitchClosedSearch"
      />

 src/views/purchasesManager/InventoryLedgerList.vue

@@ -220,7 +220,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total ,prev, pager, next,sizes"
        layout="total ,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getOrganizationSearch"
      />

 src/views/purchasesManager/arrivalNoticeList.vue

@@ -214,7 +214,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getPurchaseArrivalOrderSearch"
      />

 src/views/purchasesManager/goodsStatisticsList.vue

@@ -124,7 +124,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total ,prev, pager, next,sizes"
        layout="total ,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getOrganizationSearch"
      />

 src/views/purchasesManager/purchasesList.vue

@@ -225,7 +225,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getPurchaseOrderSearch"
      />

 src/views/purchasesManager/salesStatisticsList.vue

@@ -124,7 +124,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total ,prev, pager, next,sizes"
        layout="total ,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getOrganizationSearch"
      />

 src/views/qualityManager/defectDefine.vue

@@ -98,7 +98,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getDedectSearch"
      />

 src/views/qualityManager/processCheckItem.vue

@@ -96,7 +96,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getStepCheckItemSearch"
      />

 src/views/qualityManager/processCheckRecord.vue

@@ -160,7 +160,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="prev, pager, next,sizes"
        layout="prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getStepCheckTableSearch"
      />

 src/views/qualityManager/processCheckStandard.vue

@@ -104,7 +104,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getStepCheckStanedSearch"
      />

 src/views/qualityManager/qualityPlaning.vue

@@ -252,7 +252,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getQualityInspectionSearch"
      />

 src/views/reportManager/defectDetailList.vue

@@ -204,7 +204,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getDefectDetailsReportSearch"
      />

 src/views/reportManager/groupSalaryList.vue

@@ -273,7 +273,7 @@
            :page.sync="form.page"
            :limit.sync="form.rows"
            align="right"
            layout="total,prev, pager, next,sizes"
            layout="total,prev, pager, next,sizes,jumper"
            popper-class="select_bottom"
            @pagination="getGroupSalaryReportSearch"
          />
@@ -437,7 +437,7 @@
            :page.sync="form.page"
            :limit.sync="form.rows"
            align="right"
            layout="total,prev, pager, next,sizes"
            layout="total,prev, pager, next,sizes,jumper"
            popper-class="select_bottom"
            @pagination="getGroupSalaryReportSearch"
          />

 src/views/reportManager/installationLampList.vue

@@ -271,7 +271,7 @@
            :page.sync="form.page"
            :limit.sync="form.rows"
            align="right"
            layout="total,prev, pager, next,sizes"
            layout="total,prev, pager, next,sizes,jumper"
            popper-class="select_bottom"
            @pagination="getAnDonReportDefinitSearch"
          />
@@ -327,7 +327,7 @@
            :page.sync="formSum.page"
            :limit.sync="formSum.rows"
            align="right"
            layout="total,prev, pager, next,sizes"
            layout="total,prev, pager, next,sizes,jumper"
            popper-class="select_bottom"
            @pagination="getAnDonReportDefinitSearch"
          />

 src/views/reportManager/logisticsCheck.vue

@@ -256,7 +256,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getLogisticsCheckSearch"
      />

 src/views/reportManager/personSalaryList.vue

@@ -266,7 +266,7 @@
            :page.sync="form.page"
            :limit.sync="form.rows"
            align="right"
            layout="total,prev, pager, next,sizes"
            layout="total,prev, pager, next,sizes,jumper"
            popper-class="select_bottom"
            @pagination="getPeopleSalaryReportSearch"
          />
@@ -413,7 +413,7 @@
            :page.sync="form.page"
            :limit.sync="form.rows"
            align="right"
            layout="total,prev, pager, next,sizes"
            layout="total,prev, pager, next,sizes,jumper"
            popper-class="select_bottom"
            @pagination="getPeopleSalaryReportSearch"
          />

 src/views/reportManager/produceSchedule.vue

@@ -180,7 +180,6 @@
            label="生产进度"
            min-width="521"
            sortable="custom"
            show-tooltip-when-overflow
          >
            <template slot-scope="{row}">
              <div style="min-width: 900px;display: flex;overflow-x: auto;overflow-y: hidden">
@@ -236,7 +235,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getProductionScheduleReportSearch"
      />

 src/views/reportManager/repairDetailList.vue

@@ -215,7 +215,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getMaintenanceDetailsReportSearch"
      />

 src/views/reportManager/subcontractingOperation.vue

@@ -269,7 +269,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getOutSourceReportSearch"
      />

 src/views/systemSettings/codingRules.vue

@@ -145,7 +145,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getEncodingRules"
      />

 src/views/systemSettings/shopNotice.vue

@@ -174,7 +174,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getSystemAnnouncementSearch"
      />