1.优化项目修改bug2.实现缺陷前端页面

loulijun2021

2022-07-18 f35da7050efeaff1fd442c233008fdc00b10851f

 src/views/zzmx/chda.vue

@@ -22,11 +22,12 @@
            <el-form-item label="存货类型" style=" display: flex;">
              <el-select
                v-model="form.stocktypecode"
                filterable
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
                @change="val=>stocktypecodeChange(val,'form')"
              >
                <!--                @change="val=>stocktypecodeChange(val,'form')"-->
                <el-option
                  v-for="item in stocktypeArr"
                  :key="item.code"
@@ -35,9 +36,10 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item label="物料类型" style=" display: flex;">
            <el-form-item v-if="false" label="物料类型" style=" display: flex;">
              <el-select
                v-model="form.materialtypecode"
                filterable
                :disabled="form.stocktypecode===''"
                :popper-append-to-body="false"
                style="width: 200px"
@@ -54,10 +56,12 @@
            <el-form-item label="所属仓库" style=" display: flex;">
              <el-select
                v-model="form.storehousecode"
                filterable
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
              >
                <!--                @focus="getWareHouseSelect"-->
                <el-option
                  v-for="item in storehouseArr"
                  :key="item.code"
@@ -77,7 +81,7 @@
      <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-office-building" @click="office">单位</el-button>
        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>
        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
      </div>
      <el-divider />
      <div class="elTableDiv">
@@ -103,20 +107,17 @@
          />
          <el-table-column
            prop="partcode"
            show-overflow-tooltip
            label="物料编码"
            sortable="custom"
          />
          <el-table-column
            prop="partname"
            show-overflow-tooltip
            label="物料名称"
            sortable="custom"
          />
          <el-table-column
            prop="partspec"
            label="物料规格"
            show-overflow-tooltip
            width="110"
            sortable="custom"
          />
@@ -131,15 +132,14 @@
            label="存货类型"
            sortable="custom"
          />
          <el-table-column
            prop="materialtypename"
            label="物料类别"
            sortable="custom"
          />
          <!--          <el-table-column-->
          <!--            prop="materialtypename"-->
          <!--            label="物料类别"-->
          <!--            sortable="custom"-->
          <!--          />-->
          <el-table-column
            prop="stck_name"
            label="仓库名称"
            show-overflow-tooltip
            sortable="custom"
          />
          <el-table-column
@@ -163,16 +163,18 @@
          <el-table-column
            prop="lm_date"
            label="创建时间"
            show-overflow-tooltip
            sortable="custom"
            width="160"
          />
          <el-table-column
            label="工艺路线"
            width="80"
            prop="proute_id"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <i class="el-icon-share" @click="routeClick(row)" />
                <i v-if="row.proute_id==='Y'" class="el-icon-share" @click="routeClick(row)" />
                <i v-if="row.proute_id==='N'" style="color: #E4E7ED" class="el-icon-share" @click="routeClick(row)" />
              </div>
            </template>
          </el-table-column>
@@ -181,7 +183,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,28 +206,29 @@
    <!--新增编辑对话框-->
    <el-dialog
      :close-on-click-modal="false"
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      width="800px"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <el-form-item label="物料编码" prop="materialcode">
          <el-input v-model="dialogForm.materialcode" :disabled="operation!=='add'" style="width: 220px" />
          <el-input v-model="dialogForm.materialcode" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="物料名称" prop="materialname">
          <el-input v-model="dialogForm.materialname" style="width: 220px" />
          <el-input v-model="dialogForm.materialname" style="width: 200px" />
        </el-form-item>
        <el-form-item label="物料规格" prop="materialspec">
          <el-input v-model="dialogForm.materialspec" style="width: 220px" />
          <el-input v-model="dialogForm.materialspec" style="width: 200px" />
        </el-form-item>
        <el-form-item label="使用单位" prop="uomcode">
          <el-select
            v-model="dialogForm.uomcode"
            filterable
            :popper-append-to-body="false"
            style="width: 220px"
            style="width: 200px"
            placeholder="请选择"
          >
            <el-option
@@ -236,29 +239,16 @@
            />
          </el-select>
        </el-form-item>
        <el-form-item label="所属仓库" prop="warehousecode">
          <el-select
            v-model="dialogForm.warehousecode"
            :popper-append-to-body="false"
            style="width: 220px"
            placeholder="请选择"
          >
            <el-option
              v-for="item in storehouseArr"
              :key="item.code"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="存货类型" prop="stocktypecode">
          <el-select
            v-model="dialogForm.stocktypecode"
            filterable
            :popper-append-to-body="false"
            style="width: 220px"
            style="width: 200px"
            placeholder="请选择"
            @change="val=>stocktypecodeChange(val,'dialogForm')"
          >
            <!--            @change="val=>stocktypecodeChange(val,'dialogForm')"-->

            <el-option
              v-for="item in stocktypeArr"
              :key="item.code"
@@ -267,11 +257,29 @@
            />
          </el-select>
        </el-form-item>
        <el-form-item label="物料类型" prop="materialtypecode">
        <el-form-item label="所属仓库" prop="warehousecode">
          <el-select
            v-model="dialogForm.warehousecode"
            filterable
            :popper-append-to-body="false"
            style="width: 200px"
            placeholder="请选择"
          >
            <!--            @focus="getWareHouseSelect2"-->
            <el-option
              v-for="item in storehouseArr"
              :key="item.code"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </el-form-item>
        <el-form-item v-if="false" label="物料类型" prop="materialtypecode">
          <el-select
            v-model="dialogForm.materialtypecode"
            :popper-append-to-body="false"
            style="width: 220px"
            style="width: 200px"
            filterable
            :disabled="dialogForm.stocktypecode===''"
            placeholder="请选择"
          >
@@ -283,11 +291,12 @@
            />
          </el-select>
        </el-form-item>
        <el-form-item label="最小库存" prop="minstockqty">
          <el-input v-model="dialogForm.minstockqty" style="width: 220px" />
        </el-form-item>

        <el-form-item label="最大库存" prop="maxstockqty">
          <el-input v-model="dialogForm.maxstockqty" style="width: 220px" />
          <el-input v-model="dialogForm.maxstockqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
          <el-form-item label="最小库存" prop="minstockqty" style="margin-left: 10px">
            <el-input v-model="dialogForm.minstockqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
          </el-form-item>
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
@@ -303,7 +312,7 @@
      :close-on-click-modal="false"
      title="单位设置"
      :visible.sync="officeDialogVisible"
      width="50%"
      width="800px"
      top="15vh"
      class="officeDialogVisible"
      @close="handleCloseOffice"
@@ -316,7 +325,7 @@
        :data="officeTableData"
        border
        highlight-current-row
        height="400"
        height="300"
        :header-cell-style="this.$headerCellStyle"
        :cell-style="this.$cellStyle"
        @sort-change="sortChangeOfOffice"
@@ -356,7 +365,12 @@
          sortable="custom"
        >
          <template slot-scope="{row}">
            <el-input v-if="row.isVisible===1" v-model="row.digdect" placeholder="请输入" />
            <el-input
              v-if="row.isVisible===1"
              v-model="row.digdect"
              oninput="value=value.replace(/[^0-9]/g,'')"
              placeholder="请输入"
            />
            <div v-else> {{ row.digdect }}</div>
          </template>
        </el-table-column>
@@ -423,8 +437,9 @@
      :close-on-click-modal="false"
      title="关联工艺路线"
      :visible.sync="dialogVisibleRoute"
      width="50%"
      width="800px"
      top="15vh"
      :fullscreen="isFullscreen"
      class="dialogVisibleRoute"
      @closed="handleCloseRoute"
      @close="handleCloseRoute"
@@ -457,6 +472,26 @@
          <!--            onClick="event.cancelBubble = true"-->
        </div>
      </div>

      <el-divider />
      <div>
        <i class="el-icon-s-operation" style="color:#42b983;" /> 默认工艺路线
      </div>
      <div style="margin-top: 20px">
        <el-select
          v-model="defaultroute_code"
          filterable
          style="width: 200px"
          placeholder="请选择"
        >
          <el-option
            v-for="item in defaultroute_codeArr"
            :key="item.code"
            :label="item.name"
            :value="item.code"
          />
        </el-select>
      </div>
      <el-divider />
      <div style="margin-bottom: 10px">
        <i class="el-icon-s-operation" style="color:#42b983;" /> 工序列表
@@ -465,7 +500,7 @@
        <el-table
          :data="projectTableData"
          border
          height="400"
          height="300"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
@@ -501,6 +536,7 @@
        </div>
      </span>
    </el-dialog>

  </div>
</template>

@@ -525,7 +561,7 @@

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: 'Zzjg',
  name: 'CHDA',
  components: {
    Pagination
  },
@@ -542,6 +578,7 @@
      }
    }
    return {
      isFullscreen: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -560,6 +597,7 @@
      stocktypeArr: [], // 存货类型数组
      materialtypeArr: [], // 物料类型数组
      storehouseArr: [], // 所属仓库数组
      storehouseArr2: [], // 所属仓库数组对话框
      tableData: [],
      dialogVisible: false,
      dialogForm: {
@@ -591,21 +629,21 @@
        uomcode: [
          { required: true, message: '请选择使用单位', trigger: ['blur', 'change'] }
        ],
        warehousecode: [
          { required: true, message: '请选择所属仓库', trigger: ['blur', 'change'] }
        ],
        // warehousecode: [
        //   { required: true, message: '请选择所属仓库', trigger: ['blur', 'change'] }
        // ],
        stocktypecode: [
          { required: true, message: '请选择存货类型', trigger: ['blur', 'change'] }
        ],
        materialtypecode: [
          { required: true, message: '请输入物料类型', trigger: ['blur', 'change'] }
        ],
        minstockqty: [
          { required: true, message: '请输入最小库存', trigger: ['blur', 'change'] }
        ],
        maxstockqty: [
          { required: true, message: '请输入最大库存', trigger: ['blur', 'change'] }
        ]
        // minstockqty: [
        //   { required: true, message: '请输入最小库存', trigger: ['blur', 'change'] }
        // ],
        // maxstockqty: [
        //   { required: true, message: '请输入最大库存', trigger: ['blur', 'change'] }
        // ]

      },
      officeDialogVisible: false,
@@ -629,6 +667,8 @@
        routeOperationArr: [] // 工艺路线集合
        // routeOperationSelectedArr: [] // 工艺路线选中集合数组
      },
      defaultroute_code: '', // 默认工艺路线选中值
      defaultroute_codeArr: '', // 默认工艺路线数组
      projectTableData: []// 设备列表
    }
  },
@@ -655,6 +695,10 @@
      const { data: res } = await WareHouseSelect()
      this.storehouseArr = res
    },
    // async getWareHouseSelect2() {
    //   const { data: res } = await WareHouseSelect()
    //   this.storehouseArr2 = res
    // },
    async getuomSelect() {
      const { data: res } = await UomSelect()
      this.uomArr = res
@@ -709,7 +753,7 @@
    async   edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true
      await this.stocktypecodeChange(row.stocktypecode, 'dialogForm')
      // await this.stocktypecodeChange(row.stocktypecode, 'dialogForm')
      this.$nextTick(() => {
        this.dialogForm.id = row.id
        this.dialogForm.materialcode = row.partcode
@@ -770,8 +814,8 @@
            warehousecode: this.dialogForm.warehousecode,
            stocktypecode: this.dialogForm.stocktypecode,
            materialtypecode: this.dialogForm.materialtypecode,
            minstockqty: this.dialogForm.minstockqty,
            maxstockqty: this.dialogForm.maxstockqty,
            minstockqty: this.dialogForm.minstockqty === '' ? 0 : this.dialogForm.minstockqty,
            maxstockqty: this.dialogForm.maxstockqty === '' ? 0 : this.dialogForm.maxstockqty,
            OperType: this.operation === 'add' ? 'Add' : 'Update'
          }
          AddUpdateInventoryFile(data).then(res => {
@@ -791,100 +835,23 @@
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        // this.isFullscreen = window.innerHeight < 800
        if (window.innerHeight < 800) {
          this.tableHeight = this.tableHeight - 50
        }
      })
    },
    /* 点击关联工艺路线模块*/
    // 工艺路线点击
    async routeClick(row) {
      console.log(row)
      this.defaultroute_code = row.default_route
      this.dialogFormRoute.projectCode = row.partcode
      this.dialogFormRoute.projectName = row.partname
      this.dialogVisibleRoute = true
      const { data: res } = await InventoryFileAssociationRoute({ partcode: this.dialogFormRoute.projectCode })
      this.dialogFormRoute.routeOperationArr = res
      // let waitFlag = false// 回显等待是否放行
      this.dialogFormRoute.routeOperationArrTest = [
        {
          'flag': 'Y', code: '001', name: '测试1 ',
          'Data': [
            {
              'seq': 1,
              'stepcode': 'Step01',
              'stepname': '测试工序一',
              'enable': 'Y'
            }, {
              'seq': 2,
              'stepcode': 'Step02',
              'stepname': '测试工序二',
              'enable': 'Y'
            }, {
              'seq': 3,
              'stepcode': 'Step03',
              'stepname': '测试工序三',
              'enable': 'N'
            }
          ]
        },
        {
          'flag': 'Y', code: '002', name: '测试2 ',
          'Data': [
            {
              'seq': 1,
              'stepcode': 'Step01',
              'stepname': '测试工序一',
              'enable': 'Y'
            }, {
              'seq': 2,
              'stepcode': 'Step02',
              'stepname': '测试工序二',
              'enable': 'Y'
            }, {
              'seq': 3,
              'stepcode': 'Step03',
              'stepname': '测试工序三',
              'enable': 'N'
            }, {
              'seq': 4,
              'stepcode': 'Step02',
              'stepname': '测试工序二',
              'enable': 'Y'
            }, {
              'seq': 5,
              'stepcode': 'Step03',
              'stepname': '测试工序三',
              'enable': 'N'
            }
          ]
        },
        {
          'flag': 'N', code: '003', name: '测试3 ',
          'Data': [
            {
              'seq': 1,
              'stepcode': 'Step01',
              'stepname': '测试工序一',
              'enable': 'Y'
            }
          ]

        },
        {
          'flag': 'Y', code: '004', name: '测试4 ',
          'Data': [
            {
              'seq': 1,
              'stepcode': 'Step01',
              'stepname': '测试工序一',
              'enable': 'Y'
            }, {
              'seq': 2,
              'stepcode': 'Step02',
              'stepname': '测试工序二',
              'enable': 'Y'
            }
          ]
        }
      ]

      this.dialogFormRoute.routeOperationArr.forEach((item, index) => {
        item.isSelected1 = false
@@ -912,10 +879,15 @@
          // }, 100)
        }
      })

      this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.flag === 'Y')

      console.log(this.defaultroute_codeArr, 123)
    },
    // 对话框关闭
    handleCloseRoute() {
      this.dialogFormRoute.routeOperationArr = []
      this.defaultroute_codeArr = []
    },
    // 取消
    routeDialogVisibleCancel() {
@@ -923,15 +895,23 @@
    },
    // 确定
    async routeDialogVisibleConfirm() {
      const temp = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
      if (this.defaultroute_code === '' && temp.length > 0) {
        return this.$message.info('默认工艺路线不能为空！')
      }

      // 提交格式
      const data = []
      this.dialogFormRoute.routeOperationArr.forEach(item => {
        if (item.isSelected2) {
          data.push({ code: item.code, name: item.name })
        }
      })
      const res = await SaveInventoryFile(this.dialogFormRoute.projectCode, data)

      const res = await SaveInventoryFile(this.dialogFormRoute.projectCode, this.defaultroute_code, data)
      if (res.code === '200') {
        this.$message.success('保存成功！')
        await this.getInventoryFileSelect()
        this.dialogVisibleRoute = false
      }
    },
@@ -948,6 +928,16 @@
    myCheckboxInputClick(val) {
      console.log(val, 2)
      val.isSelected2 = !val.isSelected2

      this.dialogFormRoute.routeOperationArr.forEach((item, index) => {
        if (val.code === item.code) {
          item.flag = !item.flag
        }
      })
      if (val.code === this.defaultroute_code) {
        this.defaultroute_code = ''
      }
      this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
    },
    /* 单位模块*/
    // 单位按钮点击事件
@@ -966,7 +956,7 @@
    // 新增
    addOffice() {
      let number = Math.random() * Math.random()// 作为删除时的标识符
      number = number === 0 ? Math.random() * Math.random() : number
      number = number === 0 ? (10 + Math.random()) : number
      const data = { code: '', name: '', digdect: '', r_ule: '', isVisible: 1, number: number }
      this.officeTableData.unshift(data)
    },