loulijun2021
2023-01-03 1c0d53fe69f4fe442810d2ccc0cd44ca54931393
1.优化系统搜索栏布局
已修改40个文件
1318 ■■■■ 文件已修改
src/layout/components/Settings/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/styles/global.css 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bbgl/adbb.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bbgl/blmx.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bbgl/bzgz.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bbgl/rygz.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bbgl/wwgx.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bbgl/wxmx.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/jcsz/jsqd.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/jcsz/wldw.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/jcsz/yhqd.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/jcsz/zzjg.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sbgl/bybw.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sbgl/bybz.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sbgl/byjl.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sbgl/djbw.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sbgl/djbz.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sbgl/djjl.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sbgl/sbqd.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sbgl/wxjl.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/cngh.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/gd.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/gdplgb.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/scdd.vue 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/zdpc.vue 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/template.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/wlgl/ckdy.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/wlgl/kwdy.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/xtsz/bmgz.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/xtsz/cjgg.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zlgl/gxjybz.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zlgl/gxjyjl.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zlgl/gxjyxm.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zlgl/qxdy.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/chda.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/gxdy.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/gylx.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/jpgj.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/wllx.vue 934 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/wlqd.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/layout/components/Settings/index.vue
@@ -103,6 +103,11 @@
      ]
    }
  },
  mounted() {
    if (this.$store.state.settings.menuIsHorizontal) {
      this.sidebar.opened = true
    }
  },
  computed: {
    ...mapGetters([
      'sidebar'
src/styles/global.css
@@ -71,7 +71,8 @@
.elForm {
  display: flex;
  /*justify-content: flex-start;*/
  justify-content: space-between;
  /*justify-content: space-between;*/
  /*justify-content: space-around;*/
  width: 100%;
  flex-wrap: wrap;
}
src/views/bbgl/adbb.vue
@@ -11,10 +11,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" 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"
@@ -50,7 +50,7 @@
                end-placeholder="结束日期"
              />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="设备编码" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="设备编码" style=" display: flex;">
              <el-input v-model="form.eqpcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="设备名称" style=" display: flex;">
@@ -73,7 +73,10 @@
              />
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <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>
@@ -178,7 +181,10 @@
              />
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <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>
src/views/bbgl/blmx.vue
@@ -11,10 +11,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="工单编号" label-width="70px" style=" display: flex;">
            <el-form-item label="工单编号" style=" display: flex;">
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品编码" style=" display: flex;">
@@ -26,7 +26,7 @@
            <el-form-item label="规格型号" style=" display: flex;">
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="工序名称" label-width="70px" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="工序名称" style=" display: flex;">
              <el-input v-model="form.stepname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="缺陷代码" style=" display: flex;">
@@ -38,7 +38,7 @@
            <el-form-item v-show="isExpandForm" label="报工人员" style=" display: flex;">
              <el-input v-model="form.reportname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="报工时间" style="display: flex;align-items: center">
            <el-form-item v-show="isExpandForm" label="报工时间" style="display: flex;align-items: center">
              <el-date-picker
                v-model="form.reportdate"
                type="daterange"
@@ -55,7 +55,10 @@
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <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>
src/views/bbgl/bzgz.vue
@@ -11,10 +11,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="工单编号" style=" display: flex;" label-width="70px">
            <el-form-item label="工单编号" style="display: flex;">
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品编码" style=" display: flex;">
@@ -26,7 +26,7 @@
            <el-form-item label="规格型号" style=" display: flex;">
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="工序名称" label-width="70px" style="display: flex;">
            <el-form-item v-show="isExpandForm" label="工序名称" style="display: flex;">
              <el-input v-model="form.stepname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="生产班组" style=" display: flex;">
@@ -59,7 +59,10 @@
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <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>
@@ -200,7 +203,8 @@
            label="报工人员"
            width="110"
            sortable="custom"
          />          <el-table-column
          />
          <el-table-column
            prop="report_date"
            label="报工时间"
            width="160"
src/views/bbgl/rygz.vue
@@ -11,10 +11,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex; "
        >
          <div class="elForm">
            <el-form-item label="工单编号" style=" display: flex;" label-width="70px">
            <el-form-item label="工单编号" style="display: flex;">
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品编码" style=" display: flex;">
@@ -26,7 +26,7 @@
            <el-form-item label="规格型号" style=" display: flex;">
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="工序名称" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="工序名称" style=" display: flex;">
              <el-input v-model="form.stepname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="生产班组" style=" display: flex;">
@@ -59,7 +59,10 @@
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <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>
src/views/bbgl/wwgx.vue
@@ -11,10 +11,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="工单编号" label-width="70px" style=" display: flex;">
            <el-form-item label="工单编号" style=" display: flex;">
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品编码" style=" display: flex;">
@@ -26,7 +26,7 @@
            <el-form-item label="规格型号" style=" display: flex;">
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="工序名称" label-width="70px" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="工序名称" style=" display: flex;">
              <el-input v-model="form.stepname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="供方名称" style=" display: flex;">
@@ -64,7 +64,10 @@
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <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>
src/views/bbgl/wxmx.vue
@@ -11,10 +11,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="工单编号" style=" display: flex;" label-width="70">
            <el-form-item label="工单编号" style=" display: flex;">
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品编码" style=" display: flex;">
@@ -26,7 +26,7 @@
            <el-form-item label="规格型号" style=" display: flex;">
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="工序名称" label-width="70" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="工序名称" style=" display: flex;">
              <el-input v-model="form.stepname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="操作类型" style=" display: flex;">
@@ -46,7 +46,7 @@
            <el-form-item v-show="isExpandForm" label="报工人员" style=" display: flex;">
              <el-input v-model="form.repairname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70" label="报工时间" style="display: flex;align-items: center">
            <el-form-item v-show="isExpandForm" label="报工时间" style="display: flex;align-items: center">
              <el-date-picker
                v-model="form.repairdate"
                type="daterange"
@@ -63,7 +63,10 @@
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <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>
src/views/jcsz/jsqd.vue
@@ -19,10 +19,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="角色编码" style=" display: flex;">
            <el-form-item label="角色编码" style=" display: flex;">
              <el-input v-model="form.RoleCode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="角色名称" style=" display: flex;">
@@ -49,7 +49,10 @@
              <el-input v-model="form.UserName" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <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>
src/views/jcsz/wldw.vue
@@ -20,10 +20,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="单位编码" style=" display: flex;">
            <el-form-item label="单位编码" style=" display: flex;">
              <el-input v-model="form.CuntUnitCode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="单位名称" style=" display: flex;">
@@ -49,7 +49,10 @@
              <el-input v-model="form.CreateUser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <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>
src/views/jcsz/yhqd.vue
@@ -17,10 +17,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="用户编码" style=" display: flex;">
            <el-form-item label="用户编码" style=" display: flex;">
              <el-input v-model="form.UserCode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="用户名称" style=" display: flex;">
@@ -54,7 +54,7 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="在职状态" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="在职状态" style=" display: flex;">
              <el-select
                v-model="form.Enable"
                :popper-append-to-body="false"
@@ -71,7 +71,10 @@
              </el-select>
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <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>
src/views/jcsz/zzjg.vue
@@ -11,10 +11,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="组织编码" style=" display: flex;">
            <el-form-item label="组织编码" style=" display: flex;">
              <el-input v-model="form.OrgCode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="组织名称" style=" display: flex;">
@@ -40,7 +40,10 @@
              <el-input v-model="form.UserName" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <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>
src/views/sbgl/bybw.vue
@@ -12,10 +12,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="部位编码" style=" display: flex;">
            <el-form-item label="部位编码" style=" display: flex;">
              <el-input v-model="form.maiitemcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="部位名称" style=" display: flex;">
@@ -36,7 +36,7 @@
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/sbgl/bybz.vue
@@ -12,10 +12,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="标准编码" label-width="70px" style=" display: flex;">
            <el-form-item label="标准编码" style=" display: flex;">
              <el-input v-model="form.repairstandcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="标准名称" style=" display: flex;">
@@ -25,7 +25,10 @@
              <el-input v-model="form.repairstanddescr" placeholder="请输入" style="width: 200px" />
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <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>
src/views/sbgl/byjl.vue
@@ -13,10 +13,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm" style="justify-content: flex-start">
            <el-form-item label="生产车间" label-width="70px" 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"
@@ -35,7 +35,7 @@
            <el-form-item label="标准名称" style=" display: flex;">
              <el-input v-model="form.stanedname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm"label="保养人员" label-width="70px" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="保养人员" style=" display: flex;">
              <el-input v-model="form.repairuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="保养时间" style=" display: flex;font-size:14px;align-items: center">
@@ -62,7 +62,7 @@
              </el-select>
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
@@ -116,6 +116,7 @@
          <el-table-column
            prop="org_name"
            label="生产车间"
            min-width="120"
            show-tooltip-when-overflow
            sortable="custom"
          />
@@ -124,9 +125,11 @@
            label="设备编号"
            show-tooltip-when-overflow
            sortable="custom"
            min-width="120"
          />
          <el-table-column
            prop="eqp_name"
            min-width="120"
            label="设备名称"
            show-tooltip-when-overflow
            sortable="custom"
src/views/sbgl/djbw.vue
@@ -12,10 +12,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="部位编码" style=" display: flex;">
            <el-form-item label="部位编码" style=" display: flex;">
              <el-input v-model="form.checkitemcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="部位名称" style=" display: flex;">
@@ -34,7 +34,7 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="点检周期" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="点检周期" style=" display: flex;">
              <el-select v-model="form.cycle" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in cycleArr"
@@ -45,7 +45,10 @@
              </el-select>
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <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>
src/views/sbgl/djbz.vue
@@ -12,10 +12,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="标准编码" style=" display: flex;">
            <el-form-item label="标准编码" style=" display: flex;">
              <el-input v-model="form.checkstandcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="标准名称" style=" display: flex;">
@@ -32,7 +32,10 @@
              </el-select>
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <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>
src/views/sbgl/djjl.vue
@@ -13,10 +13,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm" style="justify-content: flex-start">
            <el-form-item label-width="70px" 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"
@@ -35,7 +35,7 @@
            <el-form-item label="标准名称" style=" display: flex;">
              <el-input v-model="form.stanedname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="点检人员" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="点检人员" style=" display: flex;">
              <el-input v-model="form.checkuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="点检时间" style=" display: flex;font-size:14px;align-items: center">
@@ -62,7 +62,7 @@
            <!--              </el-select>-->
            <!--            </el-form-item>-->
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/sbgl/sbqd.vue
@@ -20,10 +20,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm" style="justify-content: flex-start">
            <el-form-item label-width="70px" label="设备编码" style=" display: flex;">
            <el-form-item label="设备编码" style=" display: flex;">
              <el-input v-model="form.DeviceCode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="设备名称" style=" display: flex;">
@@ -62,7 +62,7 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" filterable label="设备类型" style="display: flex;">
            <el-form-item v-show="isExpandForm" filterable label="设备类型" style="display: flex;">
              <el-select
                v-model="form.DeviceType"
                :popper-append-to-body="false"
@@ -98,7 +98,10 @@
              </el-select>
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <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>
src/views/sbgl/wxjl.vue
@@ -11,10 +11,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="生产车间" label-width="70px" 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"
@@ -33,7 +33,7 @@
            <el-form-item label="报修人员" style=" display: flex;">
              <el-input v-model="form.reportuser" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="维修人员" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="维修人员" style=" display: flex;">
              <el-input v-model="form.repairuser" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="验证人员" style=" display: flex;">
@@ -67,7 +67,6 @@
            </el-form-item>
            <el-form-item
              v-show="isExpandForm"
              label-width="70px"
              label="验证时间"
              style=" display: flex;align-items: center"
            >
@@ -84,7 +83,7 @@
              />
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/scgl/cngh.vue
@@ -11,10 +11,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="生产车间" style=" display: flex;">
            <el-form-item label="生产车间" style=" display: flex;">
              <el-select
                v-model="form.workshop"
                style="width: 200px"
@@ -56,7 +56,7 @@
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/scgl/gd.vue
@@ -17,10 +17,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="订单状态" style=" display: flex;">
            <el-form-item label="订单状态" style=" display: flex;">
              <el-select
                v-model="form.mesorderstus"
                :popper-append-to-body="false"
@@ -59,7 +59,7 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="产品编码" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="产品名称" style=" display: flex;">
@@ -71,7 +71,7 @@
            <el-form-item v-show="isExpandForm" label="创建人员" style=" display: flex;">
              <el-input v-model="form.creatuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="创建时间" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="创建时间" style=" display: flex;">
              <!--              <el-date-picker-->
              <!--                v-model="form.createdate"-->
              <!--                type="daterange"-->
@@ -93,7 +93,7 @@
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/scgl/gdplgb.vue
@@ -12,10 +12,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="工单状态" label-width="70px" style=" display: flex;">
            <el-form-item label="工单状态" style=" display: flex;">
              <el-input v-model="form.mesorderstus" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="工单编号" style=" display: flex;">
@@ -34,7 +34,7 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="产品编码" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="产品名称" style=" display: flex;">
@@ -46,11 +46,11 @@
            <el-form-item v-show="isExpandForm" label="创建人员" style=" display: flex;">
              <el-input v-model="form.creatuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="创建时间" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="创建时间" style=" display: flex;">
              <el-input v-model="form.createdate" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/scgl/scdd.vue
@@ -21,10 +21,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="订单状态" style=" display: flex;">
            <el-form-item label="订单状态" style=" display: flex;">
              <el-select
                v-model="form.erporderstus"
                filterable
@@ -49,13 +49,18 @@
            <el-form-item label="产品名称" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="产品规格" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="产品规格" style=" display: flex;">
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="创建人员" style=" display: flex;">
              <el-input v-model="form.creatuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="预计开工时间" label-width="100px" style="display: flex;font-size: 14px;align-items: center">
            <el-form-item
              v-show="isExpandForm"
              label="预计开工时间"
              label-width="100px"
              style="display: flex;font-size: 14px;align-items: center"
            >
              <el-date-picker
                v-model="form.paystartdate"
                type="daterange"
@@ -71,7 +76,12 @@
              <!--              :picker-options="expireTimeOption"-->
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="预计完工时间" label-width="100px" style=" display: flex;font-size: 14px;align-items: center">
            <el-form-item
              v-show="isExpandForm"
              label="预计完工时间"
              label-width="100px"
              style=" display: flex;font-size: 14px;align-items: center"
            >
              <el-date-picker
                v-model="form.payenddate"
                type="daterange"
@@ -96,7 +106,10 @@
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <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>
@@ -302,7 +315,12 @@
              <div class="operationClass">
                <el-tooltip class="item" effect="dark" content="下达" placement="top">
                  <!--                <el-button type="text" @click="edit('edit',row)">下达</el-button>-->
                  <i class="el-icon-bottom" :style="{color:$store.state.settings.theme}" style="cursor: pointer;margin-left: 5px" @click="edit('edit',row)" />
                  <i
                    class="el-icon-bottom"
                    :style="{color:$store.state.settings.theme}"
                    style="cursor: pointer;margin-left: 5px"
                    @click="edit('edit',row)"
                  />
                </el-tooltip>
              </div>
            </template>
@@ -795,15 +813,19 @@
::v-deep  .el-range-input{
  //font-size: 14px !important;
}
::v-deep .el-range__icon{
  line-height: 28px !important;
}
::v-deep .el-range-separator{
  line-height: 28px !important;
}
::v-deep .el-range-input{
  font-size: 14px;
}
::v-deep .el-range-separator{
  display: flex;
  justify-content: center;
@@ -814,6 +836,7 @@
  color: $main_color;
  cursor: pointer;
}
.el-icon-edit-outline{
  margin-right: 15px;
}
@@ -892,6 +915,7 @@
.body ::v-deep .el-form-item {
  margin-bottom: 0;
}
.userDialogVisible ::v-deep .el-form-item {
  margin-bottom: 0;
}
@@ -906,6 +930,7 @@
  ::v-deep .el-table__fixed-right{
    height: 100% !important;
  }
  ::v-deep .el-table__fixed{
    height: 100% !important;
  }
@@ -931,6 +956,7 @@
.el-table .custom-row {
  background: #f8f8fa;
}
.osloading{
  font-size: 26px !important;
}
src/views/scgl/zdpc.vue
@@ -8,10 +8,10 @@
          :model="formTop"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="车间编码" style=" display: flex;">
            <el-form-item label="车间编码" style=" display: flex;">
              <el-input v-model="formTop.workshop" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="生产工单号" style=" display: flex;">
@@ -24,7 +24,7 @@
              <el-input v-model="formTop.partname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
@@ -188,10 +188,11 @@
            ref="form"
            :model="formBottom"
            inline
            style="display: flex;justify-content: space-between"
            label-width="100px"
            style="display: flex;"
          >
            <div class="elForm">
              <el-form-item label-width="70px" label="排程日期" style=" display: flex;">
              <el-form-item label="排程日期" style=" display: flex;">
                <el-date-picker
                  v-model="formBottom.scheDate"
                  type="daterange"
@@ -212,13 +213,13 @@
                  <el-option value="Y" label="时间优先" />
                </el-select>
              </el-form-item>
              <el-form-item label="时间刻度(分钟)" style=" display: flex;">
              <el-form-item label="时间刻度(分钟)" label-width="110" style=" display: flex;">
                <el-select v-model.number="formBottom.scale" style="width: 120px;">
                  <el-option v-for="item in scaleList" :key="item" :value="item" :label="item" />
                </el-select>
              </el-form-item>
              <el-form-item label="换型时间(分钟)" style=" display: flex;">
              <el-form-item label="换型时间(分钟)" label-width="110" style=" display: flex;">
                <el-input
                  id="scale"
                  v-model="formBottom.times"
@@ -234,7 +235,7 @@
                </span>
              </el-form-item>
            </div>
            <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
            <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
              <el-button
                type="primary"
                icon="el-icon-document-remove"
@@ -1043,13 +1044,14 @@
    // 时间/设备优先排程
    click_schedule() {
      const timestamp = new Date().toLocaleDateString()
      if (new Date(this.formBottom.scheDate[0]) < new Date(timestamp)) {
        this.$message.error('排程时间不可以小于当前时间!')
      if (new Date(this.formBottom.scheDate[1]) < new Date(timestamp)) {
        this.$message.error('排程日期不可以小于当前时间!')
        return false
      }
      this.nitialize()// 手动过滤所有设备已排程
      console.log(this.facility_data, 67890)
      // console.log(this.facility_data, 67890)
      if (this.bm_data != '' && this.formBottom.types == 'N') { // 设备优先
        this.fun_time()
        this.change_num(this.bm_data)
src/views/template.vue
@@ -12,10 +12,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm" style="justify-content: flex-start">
            <el-form-item label-width="70px" label="母件编码" style=" display: flex;">
          <div class="elForm">
            <el-form-item label="母件编码" style=" display: flex;">
              <el-input v-model="form.OrgCode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="母件名称" style=" display: flex;">
@@ -34,7 +34,7 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="版本编号" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="版本编号" style=" display: flex;">
              <el-input v-model="form.OrgName" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="创建人员" style=" display: flex;">
@@ -49,7 +49,7 @@
              />
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/wlgl/ckdy.vue
@@ -21,10 +21,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="仓库编码" style=" display: flex;">
            <el-form-item label="仓库编码" style=" display: flex;">
              <el-input v-model="form.warehousecode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="仓库名称" style=" display: flex;">
@@ -37,7 +37,7 @@
              <el-input v-model="form.createuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/wlgl/kwdy.vue
@@ -13,10 +13,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="库位编码" label-width="70px" style=" display: flex;">
            <el-form-item label="库位编码" style=" display: flex;">
              <el-input v-model="form.storagecode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="库位名称" style=" display: flex;">
@@ -41,12 +41,12 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" 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>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/xtsz/bmgz.vue
@@ -7,10 +7,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm" style="justify-content: flex-start">
            <el-form-item label="编码名称" label-width="70px" style=" display: flex;">
          <div class="elForm">
            <el-form-item label="编码名称" style=" display: flex;">
              <el-input v-model="form.rightname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="固定字符" style=" display: flex;">
src/views/xtsz/cjgg.vue
@@ -12,10 +12,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="执行车间" label-width="70px" style=" display: flex;">
            <el-form-item label="执行车间" style=" display: flex;">
              <el-select v-model="form.wkspcode" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in wkspSelectArr"
@@ -41,7 +41,7 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="公告等级" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="公告等级" style=" display: flex;">
              <el-select v-model="form.level" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in levelSelectArr"
@@ -52,7 +52,7 @@
              </el-select>
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/zlgl/gxjybz.vue
@@ -12,10 +12,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="标准代码" style=" display: flex;">
            <el-form-item label="标准代码" style=" display: flex;">
              <el-input v-model="form.stanedcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="标准名称" style=" display: flex;">
@@ -25,7 +25,7 @@
              <el-input v-model="form.staneddescr" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/zlgl/gxjyjl.vue
@@ -13,10 +13,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="工单编号" style=" display: flex;">
            <el-form-item label="工单编号" style=" display: flex;">
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品编码" style=" display: flex;">
@@ -28,7 +28,7 @@
            <el-form-item label="规格型号" style=" display: flex;">
              <el-input v-model="form.partapec" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="工序名称" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="工序名称" style=" display: flex;">
              <el-input v-model="form.stepname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="标准名称" style=" display: flex;">
@@ -55,7 +55,7 @@
              </el-select>
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/zlgl/gxjyxm.vue
@@ -12,7 +12,7 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="项目编码" style=" display: flex;">
@@ -25,7 +25,7 @@
              <el-input v-model="form.itemdescr" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/zlgl/qxdy.vue
@@ -12,10 +12,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="缺陷代码" label-width="70px" style=" display: flex;">
            <el-form-item label="缺陷代码" style=" display: flex;">
              <el-input v-model="form.defectcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="缺陷名称" style=" display: flex;">
@@ -26,7 +26,7 @@
              <el-input v-model="form.defectdescr" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/zzmx/chda.vue
@@ -32,10 +32,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="物料编码" style=" display: flex;">
            <el-form-item label="物料编码" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="物料名称" style=" display: flex;">
@@ -78,7 +78,7 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="所属仓库" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="所属仓库" style=" display: flex;">
              <el-select
                v-model="form.storehousecode"
                filterable
@@ -96,7 +96,7 @@
              </el-select>
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/zzmx/gxdy.vue
@@ -13,10 +13,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="工序编码" style=" display: flex;">
            <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;">
@@ -54,11 +54,11 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" 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>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/zzmx/gylx.vue
@@ -13,7 +13,7 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="工艺路线编码" style=" display: flex;">
@@ -29,7 +29,7 @@
              <el-input v-model="form.createuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/zzmx/jpgj.vue
@@ -13,10 +13,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="产品名称" style=" display: flex;">
            <el-form-item label="产品名称" style=" display: flex;">
              <el-select
                v-model="form.partcode"
                filterable
@@ -88,7 +88,7 @@
              </el-select>
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>
src/views/zzmx/wllx.vue
@@ -1,502 +1,502 @@
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div style="padding: 10px 5px 0 0">
        <el-form
          ref="form"
          :model="form"
          label-width="80px"
          inline
          style="display: flex;justify-content: space-between"
        >
          <div class="elForm">
            <el-form-item label="类型编码" style=" display: flex;">
              <el-input v-model="form.materialtypecode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="类型名称" style=" display: flex;">
              <el-input v-model="form.materialtypename" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="存货类型" style=" display: flex;">
              <el-select v-model="form.stocktypecode" filterable :popper-append-to-body="false" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in stocktypeArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </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>
        </el-form>
      </div>
      <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>-->
      </div>
      <el-divider />
      <div class="elTableDiv">
        <el-table
          ref="tableDataRef"
          class="tableFixed"
          :data="tableData"
          border
          stripe
          :height="tableHeight"
          :style="{width: 100+'%',height:tableHeight+'px',}"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          @sort-change="sortChange"
        >
          <!--          <el-table-column-->
          <!--            type="selection"-->
          <!--            width="50"-->
<!--<template>-->
<!--  <div>-->
<!--    <div class="body" :style="{height:mainHeight+'px'}">-->
<!--      <div style="padding: 10px 5px 0 0">-->
<!--        <el-form-->
<!--          ref="form"-->
<!--          :model="form"-->
<!--          label-width="80px"-->
<!--          inline-->
<!--          style="display: flex;"-->
<!--        >-->
<!--          <div class="elForm">-->
<!--            <el-form-item label="类型编码" style=" display: flex;">-->
<!--              <el-input v-model="form.materialtypecode" placeholder="请输入" style="width: 200px" />-->
<!--            </el-form-item>-->
<!--            <el-form-item label="类型名称" style=" display: flex;">-->
<!--              <el-input v-model="form.materialtypename" placeholder="请输入" style="width: 200px" />-->
<!--            </el-form-item>-->
<!--            <el-form-item label="存货类型" style=" display: flex;">-->
<!--              <el-select v-model="form.stocktypecode" filterable :popper-append-to-body="false" style="width: 200px" placeholder="请选择">-->
<!--                <el-option-->
<!--                  v-for="item in stocktypeArr"-->
<!--                  :key="item.code"-->
<!--                  :label="item.name"-->
<!--                  :value="item.code"-->
          <!--          />-->
          <el-table-column
            prop="RowNum"
            width="50"
            label="序号"
          />
          <el-table-column
            prop="code"
            label="物料类型编码"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="name"
            show-tooltip-when-overflow
            label="物料类型名称"
            sortable="custom"
          />
          <el-table-column
            prop="stockname"
            label="存货类型"
            sortable="custom"
            show-tooltip-when-overflow
          />
          <el-table-column
            prop="lm_user"
            show-tooltip-when-overflow
            label="创建人员"
            sortable="custom"
          />
          <el-table-column
            prop="lm_date"
            label="创建时间"
            sortable="custom"
            show-tooltip-when-overflow
          />
          <el-table-column
            label="操作"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
          </el-table-column>
        </el-table>
      </div>
      <!--分页-->
      <pagination
        :total="total"
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getMaterialTypeSearch"
      />
    </div>
<!--              </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>-->
<!--        </el-form>-->
<!--      </div>-->
<!--      <el-divider />-->
<!--      <div style="margin-left: 10px;display: flex">-->
<!--        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>-->
<!--        &lt;!&ndash;        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>&ndash;&gt;-->
<!--      </div>-->
<!--      <el-divider />-->
<!--      <div class="elTableDiv">-->
<!--        <el-table-->
<!--          ref="tableDataRef"-->
<!--          class="tableFixed"-->
<!--          :data="tableData"-->
<!--          border-->
<!--          stripe-->
<!--          :height="tableHeight"-->
<!--          :style="{width: 100+'%',height:tableHeight+'px',}"-->
<!--          highlight-current-row-->
<!--          :header-cell-style="this.$headerCellStyle"-->
<!--          :cell-style="this.$cellStyle"-->
<!--          @sort-change="sortChange"-->
<!--        >-->
<!--          &lt;!&ndash;          <el-table-column&ndash;&gt;-->
<!--          &lt;!&ndash;            type="selection"&ndash;&gt;-->
<!--          &lt;!&ndash;            width="50"&ndash;&gt;-->
<!--          &lt;!&ndash;          />&ndash;&gt;-->
<!--          <el-table-column-->
<!--            prop="RowNum"-->
<!--            width="50"-->
<!--            label="序号"-->
<!--          />-->
<!--          <el-table-column-->
<!--            prop="code"-->
<!--            label="物料类型编码"-->
<!--            show-tooltip-when-overflow-->
<!--            sortable="custom"-->
<!--          />-->
<!--          <el-table-column-->
<!--            prop="name"-->
<!--            show-tooltip-when-overflow-->
<!--            label="物料类型名称"-->
<!--            sortable="custom"-->
<!--          />-->
<!--          <el-table-column-->
<!--            prop="stockname"-->
<!--            label="存货类型"-->
<!--            sortable="custom"-->
<!--            show-tooltip-when-overflow-->
<!--          />-->
<!--          <el-table-column-->
<!--            prop="lm_user"-->
<!--            show-tooltip-when-overflow-->
<!--            label="创建人员"-->
<!--            sortable="custom"-->
<!--          />-->
<!--          <el-table-column-->
<!--            prop="lm_date"-->
<!--            label="创建时间"-->
<!--            sortable="custom"-->
<!--            show-tooltip-when-overflow-->
<!--          />-->
<!--          <el-table-column-->
<!--            label="操作"-->
<!--          >-->
<!--            <template slot-scope="{row}">-->
<!--              <div class="operationClass">-->
<!--                <el-button type="text" @click="edit('edit',row)">编辑</el-button>-->
<!--                <el-button type="text" @click="del(row)">删除</el-button>-->
<!--              </div>-->
<!--            </template>-->
<!--          </el-table-column>-->
<!--        </el-table>-->
<!--      </div>-->
<!--      &lt;!&ndash;分页&ndash;&gt;-->
<!--      <pagination-->
<!--        :total="total"-->
<!--        :page.sync="form.page"-->
<!--        :limit.sync="form.rows"-->
<!--        align="right"-->
<!--        layout="prev, pager, next,sizes"-->
<!--        popper-class="select_bottom"-->
<!--        @pagination="getMaterialTypeSearch"-->
<!--      />-->
<!--    </div>-->
    <el-dialog
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="800px"
      top="15vh"
      :close-on-click-modal="false"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <el-form-item label="类型编码" prop="materialtypecode">
          <el-input v-model="dialogForm.materialtypecode" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="类型名称" prop="materialtypename">
          <el-input v-model="dialogForm.materialtypename" style="width: 200px" />
        </el-form-item>
        <el-form-item label="存货类型" prop="stocktypecode">
          <el-select v-model="dialogForm.stocktypecode" filterable :popper-append-to-body="false" style="width: 200px" placeholder="请选择">
            <el-option
              v-for="item in stocktypeArr"
              :key="item.code"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="dialogVisibleCancel">取 消</el-button>
          <el-button type="primary" @click="dialogVisibleConfirm">确 定</el-button>
        </div>
      </span>
    </el-dialog>
  </div>
</template>
<!--    <el-dialog-->
<!--      :title="operation==='add'?'新增':'编辑'"-->
<!--      :visible.sync="dialogVisible"-->
<!--      width="800px"-->
<!--      top="15vh"-->
<!--      :close-on-click-modal="false"-->
<!--      @closed="handleClose"-->
<!--      @close="handleClose"-->
<!--    >-->
<!--      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">-->
<!--        <el-form-item label="类型编码" prop="materialtypecode">-->
<!--          <el-input v-model="dialogForm.materialtypecode" :disabled="operation!=='add'" style="width: 200px" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="类型名称" prop="materialtypename">-->
<!--          <el-input v-model="dialogForm.materialtypename" style="width: 200px" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="存货类型" prop="stocktypecode">-->
<!--          <el-select v-model="dialogForm.stocktypecode" filterable :popper-append-to-body="false" style="width: 200px" placeholder="请选择">-->
<!--            <el-option-->
<!--              v-for="item in stocktypeArr"-->
<!--              :key="item.code"-->
<!--              :label="item.name"-->
<!--              :value="item.code"-->
<!--            />-->
<!--          </el-select>-->
<!--        </el-form-item>-->
<!--      </el-form>-->
<!--      <span slot="footer" class="dialog-footer">-->
<!--        <div class="footerButton">-->
<!--          <el-button @click="dialogVisibleCancel">取 消</el-button>-->
<!--          <el-button type="primary" @click="dialogVisibleConfirm">确 定</el-button>-->
<!--        </div>-->
<!--      </span>-->
<!--    </el-dialog>-->
<!--  </div>-->
<!--</template>-->
<script>
import Pagination from '@/components/Pagination'
import { AddUpdateMaterialType, DeleteMaterialType, MaterialTypeSearch, StockTypeSelect } from '@/api/zzmx'
<!--<script>-->
<!--import Pagination from '@/components/Pagination'-->
<!--import { AddUpdateMaterialType, DeleteMaterialType, MaterialTypeSearch, StockTypeSelect } from '@/api/zzmx'-->
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: 'WLLX',
  components: {
    Pagination
  },
  data() {
    const validateName = (rule, value, callback) => {
      if (!value) {
        return callback(new Error('请输入编码'))
      } else {
        if (SER_HZ.test(value)) {
          return callback(new Error('编码不能为中文'))
        } else {
          callback()
        }
      }
    }
    return {
      mainHeight: 0,
      tableHeight: 0,
      form: {
        materialtypecode: '', // 物料类型编码
        materialtypename: '', // 物料类型名称
        stocktypecode: '', // 存货类型编码
        prop: 'lm_date', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 10 // 每页多少条
      },
      total: 10,
      stocktypeArr: [], // 存货类型数组
      tableData: [],
      dialogVisible: false,
      dialogForm: {
        'id': '',
        'materialtypecode': '',
        'materialtypename': '',
        'stocktypecode': '',
        'OperType': ''
      },
      operation: '',
      dialogFormRules: {
        materialtypecode: [
          { required: true, validator: validateName, trigger: ['blur', 'change'] }
        ],
        materialtypename: [
          { required: true, message: '请输入名称', trigger: ['blur', 'change'] }
        ],
        stocktypecode: [
          { required: true, message: '请选择存货类型', trigger: ['blur', 'change'] }
        ]
      }
<!--const SER_HZ = /^[\u4e00-\u9fa5]+$/-->
<!--export default {-->
<!--  name: 'WLLX',-->
<!--  components: {-->
<!--    Pagination-->
<!--  },-->
<!--  data() {-->
<!--    const validateName = (rule, value, callback) => {-->
<!--      if (!value) {-->
<!--        return callback(new Error('请输入编码'))-->
<!--      } else {-->
<!--        if (SER_HZ.test(value)) {-->
<!--          return callback(new Error('编码不能为中文'))-->
<!--        } else {-->
<!--          callback()-->
<!--        }-->
<!--      }-->
<!--    }-->
<!--    return {-->
<!--      mainHeight: 0,-->
<!--      tableHeight: 0,-->
<!--      form: {-->
<!--        materialtypecode: '', // 物料类型编码-->
<!--        materialtypename: '', // 物料类型名称-->
<!--        stocktypecode: '', // 存货类型编码-->
<!--        prop: 'lm_date', // 排序字段-->
<!--        order: 'desc', // 排序字段-->
<!--        page: 1, // 第几页-->
<!--        rows: 10 // 每页多少条-->
<!--      },-->
<!--      total: 10,-->
<!--      stocktypeArr: [], // 存货类型数组-->
<!--      tableData: [],-->
<!--      dialogVisible: false,-->
<!--      dialogForm: {-->
<!--        'id': '',-->
<!--        'materialtypecode': '',-->
<!--        'materialtypename': '',-->
<!--        'stocktypecode': '',-->
<!--        'OperType': ''-->
<!--      },-->
<!--      operation: '',-->
<!--      dialogFormRules: {-->
<!--        materialtypecode: [-->
<!--          { required: true, validator: validateName, trigger: ['blur', 'change'] }-->
<!--        ],-->
<!--        materialtypename: [-->
<!--          { required: true, message: '请输入名称', trigger: ['blur', 'change'] }-->
<!--        ],-->
<!--        stocktypecode: [-->
<!--          { required: true, message: '请选择存货类型', trigger: ['blur', 'change'] }-->
<!--        ]-->
<!--      }-->
    }
  },
  created() {
    this.getMaterialTypeSearch()
    this.getStockTypeSelect()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    async getMaterialTypeSearch() {
      const res = await MaterialTypeSearch(this.form)
      this.tableData = res.data
      this.total = res.count
    },
    async getStockTypeSelect() {
      const { data: res } = await StockTypeSelect()
      this.stocktypeArr = res
    },
    // 排序改变时
    sortChange({ column, prop, order }) {
      if (order === 'descending') {
        order = 'desc'
      } else if (order === 'ascending') {
        order = 'asc'
      } else {
        order = 'desc'
      }
      this.form.order = order
      this.form.prop = prop
      this.getMaterialTypeSearch()
    },
    // 查询
    search() {
      this.getMaterialTypeSearch()
    },
    upload() {
<!--    }-->
<!--  },-->
<!--  created() {-->
<!--    this.getMaterialTypeSearch()-->
<!--    this.getStockTypeSelect()-->
<!--  },-->
<!--  mounted() {-->
<!--    window.addEventListener('resize', this.getHeight)-->
<!--    this.getHeight()-->
<!--  },-->
<!--  methods: {-->
<!--    async getMaterialTypeSearch() {-->
<!--      const res = await MaterialTypeSearch(this.form)-->
<!--      this.tableData = res.data-->
<!--      this.total = res.count-->
<!--    },-->
<!--    async getStockTypeSelect() {-->
<!--      const { data: res } = await StockTypeSelect()-->
<!--      this.stocktypeArr = res-->
<!--    },-->
<!--    // 排序改变时-->
<!--    sortChange({ column, prop, order }) {-->
<!--      if (order === 'descending') {-->
<!--        order = 'desc'-->
<!--      } else if (order === 'ascending') {-->
<!--        order = 'asc'-->
<!--      } else {-->
<!--        order = 'desc'-->
<!--      }-->
<!--      this.form.order = order-->
<!--      this.form.prop = prop-->
<!--      this.getMaterialTypeSearch()-->
<!--    },-->
<!--    // 查询-->
<!--    search() {-->
<!--      this.getMaterialTypeSearch()-->
<!--    },-->
<!--    upload() {-->
    },
    // 重置
    reset() {
      this.form.materialtypecode = ''
      this.form.materialtypename = ''
      this.form.stocktypecode = ''
      this.getMaterialTypeSearch()
    },
    // 新增按钮
    add(operation) {
      this.operation = operation
      this.dialogVisible = true
    },
    // 修改按钮
    edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true
<!--    },-->
<!--    // 重置-->
<!--    reset() {-->
<!--      this.form.materialtypecode = ''-->
<!--      this.form.materialtypename = ''-->
<!--      this.form.stocktypecode = ''-->
<!--      this.getMaterialTypeSearch()-->
<!--    },-->
<!--    // 新增按钮-->
<!--    add(operation) {-->
<!--      this.operation = operation-->
<!--      this.dialogVisible = true-->
<!--    },-->
<!--    // 修改按钮-->
<!--    edit(operation, row) {-->
<!--      this.operation = operation-->
<!--      this.dialogVisible = true-->
      this.$nextTick(() => {
        this.dialogForm.id = row.id
        this.dialogForm.materialtypecode = row.code
        this.dialogForm.materialtypename = row.name
        this.dialogForm.stocktypecode = row.stockcode
      })
    },
    // 删除按钮
    async del(row) {
      this.$confirm('是否确认删除?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        DeleteMaterialType({ materialtypecode: row.code }).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            this.getMaterialTypeSearch()
          }
        })
      }).catch(() => {
        this.$message.info('已取消删除')
      })
    },
    // 对话框关闭事件
    handleClose() {
      this.dialogForm.id = ''
      this.dialogForm.materialtypecode = ''
      this.dialogForm.materialtypename = ''
      this.dialogForm.stocktypecode = ''
      this.$refs.dialogForm.clearValidate()
    },
    // 对话框取消
    dialogVisibleCancel() {
      this.dialogVisible = false
    },
    // 对话框确认
    dialogVisibleConfirm() {
      this.$refs.dialogForm.validate(valid => {
        if (valid) {
          const data = {
            'id': this.dialogForm.id,
            'materialtypecode': this.dialogForm.materialtypecode,
            'materialtypename': this.dialogForm.materialtypename,
            'stocktypecode': this.dialogForm.stocktypecode,
            'OperType': this.operation === 'add' ? 'Add' : 'Update'
          }
          AddUpdateMaterialType(data).then(res => {
            if (res.code === '200') {
              this.$message.success(this.operation === 'add' ? '添加成功!' : '修改成功!')
              this.dialogVisible = false
              this.getMaterialTypeSearch()
            } else {
              this.$message.error(this.operation === 'add' ? '添加失败!' : '修改失败!')
            }
          })
        }
      })
    },
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        this.$refs.tableDataRef.doLayout()
      })
    }
  }
}
</script>
<!--      this.$nextTick(() => {-->
<!--        this.dialogForm.id = row.id-->
<!--        this.dialogForm.materialtypecode = row.code-->
<!--        this.dialogForm.materialtypename = row.name-->
<!--        this.dialogForm.stocktypecode = row.stockcode-->
<!--      })-->
<!--    },-->
<!--    // 删除按钮-->
<!--    async del(row) {-->
<!--      this.$confirm('是否确认删除?', '提示', {-->
<!--        confirmButtonText: '确定',-->
<!--        cancelButtonText: '取消',-->
<!--        type: 'warning'-->
<!--      }).then(() => {-->
<!--        DeleteMaterialType({ materialtypecode: row.code }).then(res => {-->
<!--          if (res.code === '200') {-->
<!--            this.$message.success('删除成功!')-->
<!--            this.getMaterialTypeSearch()-->
<!--          }-->
<!--        })-->
<!--      }).catch(() => {-->
<!--        this.$message.info('已取消删除')-->
<!--      })-->
<!--    },-->
<!--    // 对话框关闭事件-->
<!--    handleClose() {-->
<!--      this.dialogForm.id = ''-->
<!--      this.dialogForm.materialtypecode = ''-->
<!--      this.dialogForm.materialtypename = ''-->
<!--      this.dialogForm.stocktypecode = ''-->
<!--      this.$refs.dialogForm.clearValidate()-->
<!--    },-->
<!--    // 对话框取消-->
<!--    dialogVisibleCancel() {-->
<!--      this.dialogVisible = false-->
<!--    },-->
<!--    // 对话框确认-->
<!--    dialogVisibleConfirm() {-->
<!--      this.$refs.dialogForm.validate(valid => {-->
<!--        if (valid) {-->
<!--          const data = {-->
<!--            'id': this.dialogForm.id,-->
<!--            'materialtypecode': this.dialogForm.materialtypecode,-->
<!--            'materialtypename': this.dialogForm.materialtypename,-->
<!--            'stocktypecode': this.dialogForm.stocktypecode,-->
<!--            'OperType': this.operation === 'add' ? 'Add' : 'Update'-->
<!--          }-->
<!--          AddUpdateMaterialType(data).then(res => {-->
<!--            if (res.code === '200') {-->
<!--              this.$message.success(this.operation === 'add' ? '添加成功!' : '修改成功!')-->
<!--              this.dialogVisible = false-->
<!--              this.getMaterialTypeSearch()-->
<!--            } else {-->
<!--              this.$message.error(this.operation === 'add' ? '添加失败!' : '修改失败!')-->
<!--            }-->
<!--          })-->
<!--        }-->
<!--      })-->
<!--    },-->
<!--    // 获取页面高度-->
<!--    getHeight() {-->
<!--      this.$nextTick(() => {-->
<!--        this.mainHeight = window.innerHeight - 250-->
<!--        this.tableHeight = this.mainHeight - 100-->
<!--        this.$refs.tableDataRef.doLayout()-->
<!--      })-->
<!--    }-->
<!--  }-->
<!--}-->
<!--</script>-->
<style lang="scss" scoped>
$main_color: #42b983;
::v-deep .el-button--primary {
  background-color: $main_color !important;
  height: 30px;
  display: flex;
  align-items: center;
  //border: 1px solid $main_color;
  border: none;
  padding: 0 20px;
}
::v-deep .el-button--primary:hover {
  border: none;
}
<!--<style lang="scss" scoped>-->
<!--$main_color: #42b983;-->
<!--::v-deep .el-button&#45;&#45;primary {-->
<!--  background-color: $main_color !important;-->
<!--  height: 30px;-->
<!--  display: flex;-->
<!--  align-items: center;-->
<!--  //border: 1px solid $main_color;-->
<!--  border: none;-->
<!--  padding: 0 20px;-->
<!--}-->
<!--::v-deep .el-button&#45;&#45;primary:hover {-->
<!--  border: none;-->
<!--}-->
::v-deep .el-button--info {
  height: 30px;
  display: flex;
  align-items: center;
  padding: 0 20px;
}
<!--::v-deep .el-button&#45;&#45;info {-->
<!--  height: 30px;-->
<!--  display: flex;-->
<!--  align-items: center;-->
<!--  padding: 0 20px;-->
<!--}-->
::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
  background-color: $main_color !important;
}
<!--::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {-->
<!--  background-color: $main_color !important;-->
<!--}-->
::v-deep .el-dialog__footer {
  display: flex;
  justify-content: flex-end;
}
<!--::v-deep .el-dialog__footer {-->
<!--  display: flex;-->
<!--  justify-content: flex-end;-->
<!--}-->
.footerButton {
  display: flex;
  justify-content: end;
}
<!--.footerButton {-->
<!--  display: flex;-->
<!--  justify-content: end;-->
<!--}-->
::v-deep .el-button--default {
  background-color: #ffffff !important;
  height: 30px;
  display: flex;
  align-items: center;
  padding: 0 20px;
}
<!--::v-deep .el-button&#45;&#45;default {-->
<!--  background-color: #ffffff !important;-->
<!--  height: 30px;-->
<!--  display: flex;-->
<!--  align-items: center;-->
<!--  padding: 0 20px;-->
<!--}-->
::v-deep .el-button--default:hover {
  color: #606266;
}
<!--::v-deep .el-button&#45;&#45;default:hover {-->
<!--  color: #606266;-->
<!--}-->
::v-deep .el-dialog__body {
  padding: 20px 100px !important;
}
<!--::v-deep .el-dialog__body {-->
<!--  padding: 20px 100px !important;-->
<!--}-->
::v-deep .el-radio__input.is-checked .el-radio__inner {
  background-color: $main_color;
  border-color: $main_color;
}
<!--::v-deep .el-radio__input.is-checked .el-radio__inner {-->
<!--  background-color: $main_color;-->
<!--  border-color: $main_color;-->
<!--}-->
::v-deep .el-radio__input.is-checked + .el-radio__label {
  color: $main_color !important;
}
<!--::v-deep .el-radio__input.is-checked + .el-radio__label {-->
<!--  color: $main_color !important;-->
<!--}-->
::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
  border-color: $main_color;
  background-color: $main_color;
}
<!--::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {-->
<!--  border-color: $main_color;-->
<!--  background-color: $main_color;-->
<!--}-->
::v-deep .el-input__inner {
  height: 30px;
  line-height: 30px;
}
<!--::v-deep .el-input__inner {-->
<!--  height: 30px;-->
<!--  line-height: 30px;-->
<!--}-->
::v-deep .el-table .caret-wrapper {
  transform: scale(0.8);
}
<!--::v-deep .el-table .caret-wrapper {-->
<!--  transform: scale(0.8);-->
<!--}-->
::v-deep .cell {
  display: flex !important;
  align-items: center !important;
  justify-content: space-between !important;
}
<!--::v-deep .cell {-->
<!--  display: flex !important;-->
<!--  align-items: center !important;-->
<!--  justify-content: space-between !important;-->
<!--}-->
::v-deep .el-button--text {
  color: $main_color;
  font-size: 14px;
  cursor: pointer;
}
<!--::v-deep .el-button&#45;&#45;text {-->
<!--  color: $main_color;-->
<!--  font-size: 14px;-->
<!--  cursor: pointer;-->
<!--}-->
.operationClass {
  height: 23px;
  display: flex;
  justify-content: space-between;
  align-items: center;
}
<!--.operationClass {-->
<!--  height: 23px;-->
<!--  display: flex;-->
<!--  justify-content: space-between;-->
<!--  align-items: center;-->
<!--}-->
.el-icon-share {
  color: $main_color;
  cursor: pointer;
}
<!--.el-icon-share {-->
<!--  color: $main_color;-->
<!--  cursor: pointer;-->
<!--}-->
.el-checkbox.is-bordered.is-checked {
  border-color: $main_color;
}
<!--.el-checkbox.is-bordered.is-checked {-->
<!--  border-color: $main_color;-->
<!--}-->
::v-deep .el-radio__input.is-checked .el-radio__inner {
  border-color: $main_color;
  background: $main_color;
}
<!--::v-deep .el-radio__input.is-checked .el-radio__inner {-->
<!--  border-color: $main_color;-->
<!--  background: $main_color;-->
<!--}-->
::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
  border-color: $main_color;
  background: $main_color;
}
<!--::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {-->
<!--  border-color: $main_color;-->
<!--  background: $main_color;-->
<!--}-->
::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
  color: $main_color !important;
}
<!--::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {-->
<!--  color: $main_color !important;-->
<!--}-->
::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
  margin: 10px 30px 0px 0;
}
<!--::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {-->
<!--  margin: 10px 30px 0px 0;-->
<!--}-->
::v-deep .el-radio__input.is-checked + .el-radio__label {
  color: $main_color;
}
<!--::v-deep .el-radio__input.is-checked + .el-radio__label {-->
<!--  color: $main_color;-->
<!--}-->
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
  margin: 10px 30px 0px 0;
}
<!--::v-deep .el-radio.is-bordered + .el-radio.is-bordered {-->
<!--  margin: 10px 30px 0px 0;-->
<!--}-->
.body ::v-deep .el-divider {
  border: 1px solid #eee;
  width: 99%;
  margin: 10px auto;
}
<!--.body ::v-deep .el-divider {-->
<!--  border: 1px solid #eee;-->
<!--  width: 99%;-->
<!--  margin: 10px auto;-->
<!--}-->
.body ::v-deep .el-form-item {
  margin-bottom: 0;
}
<!--.body ::v-deep .el-form-item {-->
<!--  margin-bottom: 0;-->
<!--}-->
::v-deep .el-input__inner:focus {
  border-color: $main_color;
}
::v-deep .el-textarea__inner:focus{
  border-color: $main_color;
}
::v-deep .el-select .el-input__inner:focus{
  border-color: $main_color;
}
<!--::v-deep .el-input__inner:focus {-->
<!--  border-color: $main_color;-->
<!--}-->
<!--::v-deep .el-textarea__inner:focus{-->
<!--  border-color: $main_color;-->
<!--}-->
<!--::v-deep .el-select .el-input__inner:focus{-->
<!--  border-color: $main_color;-->
<!--}-->
::v-deep .el-select-dropdown__item.selected{
  color: $main_color;
}
.tableFixed{
  ::v-deep .el-table__fixed-right{
    height: 100% !important;
  }
  ::v-deep .el-table__fixed{
    height: 100% !important;
  }
}
</style>
<!--::v-deep .el-select-dropdown__item.selected{-->
<!--  color: $main_color;-->
<!--}-->
<!--.tableFixed{-->
<!--  ::v-deep .el-table__fixed-right{-->
<!--    height: 100% !important;-->
<!--  }-->
<!--  ::v-deep .el-table__fixed{-->
<!--    height: 100% !important;-->
<!--  }-->
<!--}-->
<!--</style>-->
src/views/zzmx/wlqd.vue
@@ -12,10 +12,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="母件编码" label-width="70px" style=" display: flex;">
            <el-form-item label="母件编码" style=" display: flex;">
              <el-input v-model="form.parentpartcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="母件名称" style=" display: flex;">
@@ -34,7 +34,7 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="版本编号" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="版本编号" style=" display: flex;">
              <el-input v-model="form.version" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="创建人员" style=" display: flex;">
@@ -64,7 +64,7 @@
              </el-select>
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <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>