loulijun2021
2022-07-02 33d9266f5b3f72b518b17645a4d04921eea49651
1.修改bug
已修改17个文件
920 ■■■■■ 文件已修改
src/views/jcsz/jsqd.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/jcsz/wldw.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/jcsz/yhqd.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/jcsz/zzjg.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sbgl/sbqd.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/gd.vue 638 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/scdd.vue 216 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/template.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/template2.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/wlgl/ckdy.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/wlgl/kwdy.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/xtsz/bmgz.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/chda.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/gxdy.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/gylx.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/jpgj.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/wllx.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/jcsz/jsqd.vue
@@ -128,7 +128,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
@@ -150,7 +150,7 @@
    <!--    新增修改对话框-->
    <el-dialog
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      top="15vh"
src/views/jcsz/wldw.vue
@@ -141,7 +141,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
@@ -162,7 +162,7 @@
    </div>
    <el-dialog
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      top="15vh"
src/views/jcsz/yhqd.vue
@@ -156,7 +156,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row.id)">删除</el-button>
              </div>
            </template>
@@ -176,9 +176,9 @@
      />
    </div>
    <!--    用户清单新增、修改-->
    <!--    用户清单新增、编辑-->
    <el-dialog
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      :close-on-click-modal="false"
src/views/jcsz/zzjg.vue
@@ -107,7 +107,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row.id)">删除</el-button>
              </div>
            </template>
@@ -128,7 +128,7 @@
    </div>
    <el-dialog
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      top="15vh"
src/views/sbgl/sbqd.vue
@@ -176,7 +176,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
@@ -198,7 +198,7 @@
    <!--设备清单新增编辑-->
    <el-dialog
      :close-on-click-modal="false"
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      top="15vh"
src/views/scgl/gd.vue
@@ -1,11 +1,643 @@
<template />
<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-select
                v-model="form.erporderstus"
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in erporderstusArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </el-form-item>
            <el-form-item label="订单编号" style=" display: flex;">
              <el-input v-model="form.erpordercode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品编码" style=" display: flex;">
              <el-select v-model="form.partcode" :popper-append-to-body="false" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in OrgTypeArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </el-form-item>
            <el-form-item label="产品名称" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item label="产品规格" style=" display: flex;">
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item label="交付时间" style=" display: flex;">
              <el-date-picker
                v-model="form.paydate"
                type="date"
                style="width: 200px"
                placeholder="选择日期"
              />
            </el-form-item>
            <el-form-item label="创建人员" style=" display: flex;">
              <el-input v-model="form.creatuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item label="创建时间" style=" display: flex;">
              <el-date-picker
                v-model="form.createdate"
                type="date"
                style="width: 200px"
                placeholder="选择日期"
              />
            </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-refresh-right"
        >同步ERP
        </el-button>
        <el-button
          type="primary"
          icon="el-icon-switch-button"
        >订单关闭
        </el-button>
        <!--        <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
          :data="tableData"
          :height="tableHeight"
          border
          stripe
          :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"-->
          <!--          />-->
          <el-table-column
            width="50"
          >
            <template scope="scope">
              <el-radio
                v-model="radioSelected"
                style="color: #fff;padding-left: 10px; margin-right: -25px;"
                @change.native="getCurrentRow(scope.row)"
              />
            </template>
          </el-table-column>
          <el-table-column
            prop="RowNum"
            width="50"
            label="序号"
          />
          <el-table-column
            prop="status"
            label="订单状态"
            sortable="custom"
            width="110"
          >
            <template slot-scope="{row}">
              <div v-if="row.status==='CREATING'">进行中</div>
              <div v-if="row.status==='NEW'">未开始</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="wo_code"
            label="工单编号"
            sortable="custom"
          />
          <el-table-column
            prop="partcode"
            label="产品编码"
            sortable="custom"
          />
          <el-table-column
            prop="partname"
            label="产品名称"
            sortable="custom"
          />
          <el-table-column
            prop="partspec"
            label="产品规格"
            sortable="custom"
            width="110"
          />
          <el-table-column
            prop="plan_qty"
            label="工数量"
            sortable="custom"
          />
          <el-table-column
            prop="plan_qty"
            label="生产车间"
            sortable="custom"
          />
          <el-table-column
            prop="wkshp_name"
            label="工艺路线"
            sortable="custom"
          />
          <el-table-column
            prop="route_name"
            label="生产车间"
            sortable="custom"
          />
          <el-table-column
            prop="paydate"
            label="要求交付时间"
            sortable="custom"
          />
          <el-table-column
            prop="createuser"
            label="创建人员"
            sortable="custom"
          />
          <el-table-column
            prop="createdate"
            label="创建时间"
            show-overflow-tooltip
            sortable="custom"
          />
          <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
        v-show="total>0"
        :total="total"
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getMesOrderSearch"
      />
    </div>
    <el-dialog
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <el-form-item label="订单状态" prop="OrgCode">
          <el-select
            v-model="form.partcode"
            disabled
            :popper-append-to-body="false"
            style="width: 220px"
            placeholder="请选择"
          >
            <el-option
              v-for="item in OrgTypeArr"
              :key="item.code"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="订单编号" prop="OrgCode">
          <el-input v-model="dialogForm.OrgCode" disabled style="width: 220px" />
        </el-form-item>
        <el-form-item label="产品编码" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
        </el-form-item>
        <el-form-item label="产品名称" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
        </el-form-item>
        <el-form-item label="订单数量" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
        </el-form-item>
        <el-form-item label="产品规格" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
        </el-form-item>
        <el-form-item label="下达数量" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        </el-form-item>
        <el-form-item label="下单数量" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        </el-form-item>
        <el-form-item label="交付时间" prop="OrgName">
          <el-date-picker
            v-model="dialogForm.OrgName"
            type="date"
            style="width: 220px"
            placeholder="选择日期"
          />
          <!--          <el-input v-model="dialogForm.OrgName" style="width: 220px" />-->
        </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 { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import { ErpOrderSearch, MesOrderSearch } from '@/api/scgl'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: 'Gd'
  name: 'Zzjg',
  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: {
        mesorderstus: '', // 工单状态码
        mesordercode: '', // 工单编号
        partcode: '', // 产品编码
        partname: '', // 产品名称
        partspec: '', // 产品规格
        creatuser: '', // 创建人员
        createdate: '', // 创建时间
        prop: 'partcode', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 20 // 每页多少条
      },
      erporderstusArr: [
        { code: 'CREATING', name: '进行中' },
        { code: 'NEW', name: '未开始' }
      ],
      total: 10,
      radioSelected: '',
      tableData: [],
      dialogVisible: false,
      dialogForm: {
        OrgType: '',
        OrgCode: '',
        OrgName: '',
        SupUnit: ''// 上级单位
      },
      operation: '',
      dialogFormRules: {
        OrgType: [
          { required: true, message: '请输入选择类型', trigger: ['blur', 'change'] }
        ],
        OrgCode: [
          { required: true, validator: validateName, trigger: ['blur', 'change'] }
        ],
        OrgName: [
          { required: true, message: '请输入名称', trigger: ['blur', 'change'] }
        ]
      }
    }
  },
  created() {
    this.getMesOrderSearch()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    async getMesOrderSearch() {
      const res = await MesOrderSearch(this.form)
      this.tableData = res.data
      this.total = res.count
    },
    // 排序改变时
    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.getMesOrderSearch()
    },
    // 查询
    search() {
      this.getMesOrderSearch()
    },
    upload() {
    },
    // 重置
    reset() {
      this.form.erporderstus = ''
      this.form.erpordercode = ''
      this.form.partcode = ''
      this.form.partname = ''
      this.form.partspec = ''
      this.form.paydate = ''
      this.form.creatuser = ''
      this.form.createdate = ''
      this.getMesOrderSearch()
    },
    // 单选框选中获取当前行信息
    getCurrentRow(row) {
      console.log(row, 1)
    },
    // 新增按钮
    add(operation) {
      this.operation = operation
      this.dialogVisible = true
    },
    // 修改按钮
    edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true
      this.$nextTick(() => {
        this.dialogForm.OrgCode = row.org_code
        this.dialogForm.OrgName = row.org_name
        this.dialogForm.SupUnit = row.parent_id
      })
    },
    // 删除按钮
    async del(row) {
      this.$confirm('是否确认删除?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        DeleteOrganization({ orgid: row.code }).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            this.getMesOrderSearch()
          }
        })
      }).catch(() => {
        this.$message.info('已取消删除')
      })
    },
    // 对话框关闭事件
    handleClose() {
      this.dialogForm.OrgType = ''
      this.dialogForm.OrgCode = ''
      this.dialogForm.OrgName = ''
      this.dialogForm.SupUnit = ''
      this.$refs.dialogForm.clearValidate()
    },
    // 对话框取消
    dialogVisibleCancel() {
      this.dialogVisible = false
    },
    // 对话框确认
    dialogVisibleConfirm() {
      this.$refs.dialogForm.validate(valid => {
        if (valid) {
          const data = {
            OrganCode: this.dialogForm.OrgCode,
            OrganName: this.dialogForm.OrgName,
            OperType: this.operation === 'add' ? 'Add' : 'Update',
            Operator: getCookie('admin')
          }
          AddUpdateOrganization(data).then(res => {
            if (res.code === '200') {
              this.$message.success(this.operation === 'add' ? '添加成功!' : '修改成功!')
              this.dialogVisible = false
              this.getMesOrderSearch()
            } else {
              this.$message.error(this.operation === 'add' ? '添加失败!' : '修改失败!')
            }
          })
        }
      })
    },
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
      })
    }
  }
}
</script>
<style scoped>
<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;
}
::v-deep .el-button--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-dialog__footer {
  display: flex;
  justify-content: flex-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--default:hover {
  color: #606266;
}
::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__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-input__inner {
  height: 30px;
  line-height: 30px;
}
::v-deep .el-input__inner:focus {
  border-color: $main_color;
}
::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 .el-button--text {
  color: $main_color;
  font-size: 14px;
  cursor: pointer;
}
.operationClass {
  height: 23px;
  display: flex;
  justify-content: space-between;
  align-items: center;
}
.el-icon-share {
  color: $main_color;
  cursor: pointer;
}
.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-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.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.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-form-item {
  margin-bottom: 0;
}
::v-deep .el-input__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;
}
::v-deep .el-checkbox__inner:hover {
  border-color: $main_color;
}
::v-deep .el-textarea__inner:focus {
  border-color: $main_color;
}
</style>
src/views/scgl/scdd.vue
@@ -11,7 +11,12 @@
        >
          <div class="elForm">
            <el-form-item label="订单状态" style=" display: flex;">
              <el-select v-model="form.erporderstus" :popper-append-to-body="false" style="width: 200px" placeholder="请选择">
              <el-select
                v-model="form.erporderstus"
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in erporderstusArr"
                  :key="item.code"
@@ -20,11 +25,12 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item label="组织名称" style=" display: flex;">
              <el-input v-model="form.OrgName" placeholder="请输入" style="width: 200px" />
            <el-form-item label="订单编号" style=" display: flex;">
              <el-input v-model="form.erpordercode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="组织类型" style=" display: flex;">
              <el-select v-model="form.OrgType" :popper-append-to-body="false" style="width: 200px" placeholder="请选择">
            <el-form-item label="产品编码" style=" display: flex;">
              <el-select v-model="form.partcode" :popper-append-to-body="false" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in OrgTypeArr"
                  :key="item.code"
@@ -33,8 +39,30 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item label="产品名称" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item label="产品规格" style=" display: flex;">
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item label="交付时间" style=" display: flex;">
              <el-date-picker
                v-model="form.paydate"
                type="date"
                style="width: 200px"
                placeholder="选择日期"
              />
            </el-form-item>
            <el-form-item label="创建人员" style=" display: flex;">
              <el-input v-model="form.UserName" style="width: 200px" placeholder="请输入" />
              <el-input v-model="form.creatuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item label="创建时间" style=" display: flex;">
              <el-date-picker
                v-model="form.createdate"
                type="date"
                style="width: 200px"
                placeholder="选择日期"
              />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
@@ -45,8 +73,18 @@
      </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>
        <el-button
          type="primary"
          icon="el-icon-refresh-right"
        >同步ERP
        </el-button>
        <el-button
          type="primary"
          icon="el-icon-switch-button"
        >订单关闭
        </el-button>
        <!--        <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">
@@ -66,46 +104,78 @@
          <!--            width="50"-->
          <!--          />-->
          <el-table-column
            width="50"
          >
            <template scope="scope">
              <el-radio
                v-model="radioSelected"
                style="color: #fff;padding-left: 10px; margin-right: -25px;"
                @change.native="getCurrentRow(scope.row)"
              />
            </template>
          </el-table-column>
          <el-table-column
            prop="RowNum"
            width="50"
            label="序号"
          />
          <el-table-column
            prop="org_code"
            label="组织编码"
            prop="status"
            label="订单状态"
            sortable="custom"
          />
          <el-table-column
            prop="org_name"
            label="组织名称"
            sortable="custom"
          />
          <el-table-column
            prop="description"
            label="组织类型"
            sortable="custom"
            width="110"
          >
            <template slot-scope="{row}">
              <div v-if="row.description==='F'">工厂</div>
              <div v-if="row.description==='D'">部门</div>
              <div v-if="row.description==='W'">车间</div>
              <div v-if="row.description==='K'">科室</div>
              <div v-if="row.description==='L'">生产线</div>
              <div v-if="row.status==='CREATING'">进行中</div>
              <div v-if="row.status==='NEW'">未开始</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="parentorg_name"
            label="上级单位"
            prop="wo"
            label="订单编号"
            sortable="custom"
          />
          <el-table-column
            prop="lm_user"
            prop="partcode"
            label="产品编码"
            sortable="custom"
          />
          <el-table-column
            prop="partname"
            label="产品名称"
            sortable="custom"
          />
          <el-table-column
            prop="partspec"
            label="产品规格"
            sortable="custom"
            width="110"
          />
          <el-table-column
            prop="qty"
            label="订单数量"
            sortable="custom"
          />
          <el-table-column
            prop="wkshp_name"
            label="生成车间"
            sortable="custom"
          />
          <el-table-column
            prop="paydate"
            label="要求交付时间"
            sortable="custom"
            show-overflow-tooltip
          />
          <el-table-column
            prop="createuser"
            label="创建人员"
            sortable="custom"
          />
          <el-table-column
            prop="lm_date"
            prop="createdate"
            label="创建时间"
            show-overflow-tooltip
            sortable="custom"
          />
          <el-table-column
@@ -113,8 +183,8 @@
          >
            <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>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <!--                <el-button type="text" @click="del(row)">删除</el-button>-->
              </div>
            </template>
          </el-table-column>
@@ -134,36 +204,61 @@
    </div>
    <el-dialog
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <el-form-item label="组织类型" prop="OrgType" />
        <el-form-item label="组织编码" prop="OrgCode">
          <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 220px" />
        </el-form-item>
        <el-form-item label="组织名称" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        </el-form-item>
        <el-form-item prop="SupUnit" label="上级单位">
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <el-form-item label="订单状态" prop="OrgCode">
          <el-select
            v-model="dialogForm.SupUnit"
            v-model="form.partcode"
            disabled
            :popper-append-to-body="false"
            style="width: 220px"
            placeholder="请选择"
            :popper-append-to-body="false"
          >
            <el-option
              v-for="item in SupUnitArr"
              v-for="item in OrgTypeArr"
              :key="item.code"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="订单编号" prop="OrgCode">
          <el-input v-model="dialogForm.OrgCode" disabled style="width: 220px" />
        </el-form-item>
        <el-form-item label="产品编码" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
        </el-form-item>
        <el-form-item label="产品名称" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
        </el-form-item>
        <el-form-item label="订单数量" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
        </el-form-item>
        <el-form-item label="产品规格" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
        </el-form-item>
        <el-form-item label="下达数量" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        </el-form-item>
        <el-form-item label="下单数量" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        </el-form-item>
        <el-form-item label="交付时间" prop="OrgName">
          <el-date-picker
            v-model="dialogForm.OrgName"
            type="date"
            style="width: 220px"
            placeholder="选择日期"
          />
          <!--          <el-input v-model="dialogForm.OrgName" style="width: 220px" />-->
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
@@ -218,9 +313,10 @@
      },
      erporderstusArr: [
        { code: 'CREATING', name: '进行中' },
        { code: 'CREATE', name: '未开始' }
        { code: 'NEW', name: '未开始' }
      ],
      total: 10,
      radioSelected: '',
      tableData: [],
      dialogVisible: false,
      dialogForm: {
@@ -280,13 +376,20 @@
    },
    // 重置
    reset() {
      this.form.OrgCode = ''
      this.form.OrgName = ''
      this.form.OrgType = ''
      this.form.UserName = ''
      this.form.erporderstus = ''
      this.form.erpordercode = ''
      this.form.partcode = ''
      this.form.partname = ''
      this.form.partspec = ''
      this.form.paydate = ''
      this.form.creatuser = ''
      this.form.createdate = ''
      this.getErpOrderSearch()
    },
    // 单选框选中获取当前行信息
    getCurrentRow(row) {
      console.log(row, 1)
    },
    // 新增按钮
    add(operation) {
      this.operation = operation
@@ -376,9 +479,11 @@
  border: none;
  padding: 0 20px;
}
::v-deep .el-button--primary:hover {
  border: none;
}
::v-deep .el-button--info {
  height: 30px;
  display: flex;
@@ -434,6 +539,7 @@
  height: 30px;
  line-height: 30px;
}
::v-deep .el-input__inner:focus {
  border-color: $main_color;
}
@@ -510,17 +616,19 @@
  border-color: $main_color;
}
::v-deep .el-select .el-input__inner:focus{
::v-deep .el-select .el-input__inner:focus {
  border-color: $main_color;
}
::v-deep .el-select-dropdown__item.selected{
::v-deep .el-select-dropdown__item.selected {
  color: $main_color;
}
::v-deep .el-checkbox__inner:hover{
::v-deep .el-checkbox__inner:hover {
  border-color: $main_color;
}
::v-deep .el-textarea__inner:focus{
::v-deep .el-textarea__inner:focus {
  border-color: $main_color;
}
src/views/template.vue
@@ -106,7 +106,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
@@ -127,7 +127,7 @@
    </div>
    <el-dialog
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      top="15vh"
src/views/template2.vue
@@ -105,7 +105,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
@@ -126,7 +126,7 @@
    </div>
    <el-dialog
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      top="15vh"
src/views/wlgl/ckdy.vue
@@ -86,7 +86,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
@@ -107,7 +107,7 @@
    </div>
    <el-dialog
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      :close-on-click-modal="false"
src/views/wlgl/kwdy.vue
@@ -101,7 +101,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
@@ -122,7 +122,7 @@
    </div>
    <el-dialog
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      :close-on-click-modal="false"
src/views/xtsz/bmgz.vue
@@ -101,7 +101,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <!--                <el-button type="text" @click="del(row)">删除</el-button>-->
              </div>
            </template>
src/views/zzmx/chda.vue
@@ -181,7 +181,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
@@ -204,7 +204,7 @@
    <!--新增编辑对话框-->
    <el-dialog
      :close-on-click-modal="false"
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      top="15vh"
src/views/zzmx/gxdy.vue
@@ -147,7 +147,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
@@ -169,7 +169,7 @@
    <!--新增修改对话框-->
    <el-dialog
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      :close-on-click-modal="false"
src/views/zzmx/gylx.vue
@@ -96,7 +96,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <!--                <el-button type="text" @click="edit('edit',row)">修改</el-button>-->
                <!--                <el-button type="text" @click="edit('edit',row)">编辑</el-button>-->
                <el-button type="text" @click="edit('edit',row)">预览</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
src/views/zzmx/jpgj.vue
@@ -176,7 +176,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
@@ -197,7 +197,7 @@
    </div>
    <el-dialog
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="70%"
      top="15vh"
@@ -752,12 +752,11 @@
        type: 'warning'
      }).then(() => {
        const data = {
          partcode: this.eqpTable.partcode,
          routecode: this.eqpTable.routecode,
          stepcode: this.eqpTable.stepcode,
          partcode: row.partcode,
          routecode: row.route_code,
          stepcode: row.stepcode,
          eqpcode: row.eqp_code
        }
        console.log(data)
        DeleteBeatRate(data).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
@@ -783,6 +782,7 @@
      this.stepDialogArr = []
      this.eqpDialogArr = []
      this.$refs.dialogForm.clearValidate()
      this.getBeatRateSearch()
    },
    // 对话框取消
    dialogVisibleCancel() {
src/views/zzmx/wllx.vue
@@ -90,7 +90,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
@@ -111,7 +111,7 @@
    </div>
    <el-dialog
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      top="15vh"