1.修改bug

loulijun2021

2022-07-02 33d9266f5b3f72b518b17645a4d04921eea49651

 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;
}