1.维修记录接口接入完成2.工单列表新增、派发增加参数

loulijun2021

2022-10-15 ab263c5fb0e0b273563391bd0c2d7b3710b03d4c

1.维修记录接口接入完成2.工单列表新增、派发增加参数

 src/components/DatePicker/index.vue

@@ -443,19 +443,15 @@
    // 工作日历提交
    CapacityPlanningGivePlanSubmit() {
      const formData = new FormData()
      formData.append('CaptPlanId', this.rowData.CaptPlanId)// 产能资源id
      formData.append('WkshopCode', this.rowData.CaptPlanWorkShopid)// 车间编码
      formData.append('CapUnitCode', this.rowData.CaptPlanDeviceTypeid)// 生产单元（产线编码）
      formData.append('CaptSetupCode', '')
      formData.append('CaptPlanType', this.rowData.CaptPlanType)// 产能类型
      console.log(this.defArr, 555)
      formData.append('WorkList', JSON.stringify(this.defArr))
      console.log(formData, 666)

      for (const [a, b] of formData.entries()) {
        console.log(a, ':', b)
      }

      formData.append('wkshopcode', this.rowData.CaptPlanWorkShopid)// 车间编码
      formData.append('capunitcode', this.rowData.CaptPlanDeviceTypeid)// 生产单元编码（产线编码）
      formData.append('captplanid', this.rowData.CaptPlanId)// 产能资源id
      formData.append('capsetupcode', this.rowData.CaptPlanWorkShiftCode) // 默认方案编码
      formData.append('captplantype', this.rowData.CaptPlanType)// 资源类型
      formData.append('worklist', JSON.stringify(this.defArr))// 工作日历数据集
      // for (const [a, b] of formData.entries()) {
      //   console.log(a, ':', b)
      // }
      CapacityPlanningGivePlanSubmit(formData).then(res => {
        if (res.code === '200') {
          this.$message.success('保存成功！')

 src/views/sbgl/wxjl.vue

@@ -2,8 +2,6 @@
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div class="bodyTopButtonGroup" style="justify-content: space-between">
        <!--        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>-->
        <!--        <el-button icon="el-icon-download" @click="upload">导入</el-button>-->
        <el-button type="primary" icon="el-icon-download" @click="download">导出</el-button>
      </div>

@@ -16,13 +14,7 @@
          style="display: flex;justify-content: space-between"
        >
          <div class="elForm">
            <el-form-item label="设备编码" label-width="70px" style=" display: flex;">
              <el-input v-model="form.eqpcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="设备名称" style=" display: flex;">
              <el-input v-model="form.eqpname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="生产车间" style=" display: flex;">
            <el-form-item label="生产车间" label-width="70px" style=" display: flex;">
              <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in wkshopSelectArr"
@@ -32,20 +24,46 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item label="设备编码" style=" display: flex;">
              <el-input v-model="form.eqpcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="设备名称" style=" display: flex;">
              <el-input v-model="form.eqpname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <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-width="70px" 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;">
            <el-form-item v-show="isExpandForm" label="验证人员" style=" display: flex;">
              <el-input v-model="form.vrifcatuser" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="维修时间" style=" display: flex;">
              <el-input v-model="form.reportdate" placeholder="请输入" style="width: 200px" />
            <el-form-item v-show="isExpandForm" label="报修时间" style=" display: flex;align-items: center">
              <el-date-picker
                v-model="form.reportdate"
                type="daterange"
                :clearable="false"
                class="timeMini"
                range-separator="~"
                start-placeholder="开始日期"
                style="width: 200px;display: flex;line-height: 34px ;height: 34px ;"
                end-placeholder="结束日期"
                size="mini"
              />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="验证人员" style=" display: flex;">
              <el-input v-model="form.repairdate" placeholder="请输入" style="width: 200px" />
            <el-form-item v-show="isExpandForm" label="维修时间" style=" display: flex;align-items: center">
              <el-date-picker
                v-model="form.repairdate"
                type="daterange"
                :clearable="false"
                class="timeMini"
                range-separator="~"
                start-placeholder="开始日期"
                style="width: 200px;display: flex;line-height: 34px ;height: 34px ;"
                end-placeholder="结束日期"
                size="mini"
              />
            </el-form-item>
            <el-form-item
              v-show="isExpandForm"
@@ -228,7 +246,7 @@
    </div>

    <el-dialog
      :title="operation==='add'?'新增':'维修明细'"
      title="维修明细"
      :visible.sync="dialogVisible"
      width="800px"
      :close-on-click-modal="false"
@@ -246,7 +264,7 @@
          <div v-if="dialogData1.faultimage" style="display: flex;margin-bottom: 10px">故障图片：
            <div v-for="item in dialogData1.faultimage">
              <img
                style="width: 100px;margin-left: 10px"
                style="width: 100px;margin-right: 10px"
                :src="baseUrl+item.img1url"
                alt=""
                @click="handlePictureCardPreview(baseUrl+item.img1url)"
@@ -260,9 +278,9 @@
        <div style="display: flex;flex-direction: column;margin-left: 40px">
          <div style="margin-bottom: 10px">故障描述：{{ dialogData2.faultdescr }}</div>
          <div v-if="dialogData2.repairimage" style="display: flex;margin-bottom: 10px">故障图片：
            <div v-for="item in dialogData2.repairimage">
            <div v-for="item in dialogData2.repairimage" v-if="item.img1url!==''">
              <img
                style="width: 100px;margin-left: 10px"
                style="width: 100px;margin-right: 10px"
                :src="baseUrl+item.img1url"
                alt=""
                @click="handlePictureCardPreview(baseUrl+item.img1url)"
@@ -273,9 +291,9 @@
          <div v-if="dialogData2.repaircontent" style="margin-bottom: 10px">维修内容：{{ dialogData2.repaircontent }}</div>
          <div v-if="dialogData2.repairpart" style="margin-bottom: 10px">更换备件：{{ dialogData2.repairpart }}</div>
          <div v-if="dialogData2.repairimage" style="display: flex;margin-bottom: 10px">备件图片：
            <div v-for="item in dialogData2.repairimage">
            <div v-for="item in dialogData2.repairimage" v-if="item.img2url!==''">
              <img
                style="width: 100px;margin-left: 10px"
                style="width: 100px;margin-right: 10px"
                :src="baseUrl+item.img2url"
                alt=""
                @click="handlePictureCardPreview(baseUrl+item.img2url)"
@@ -287,7 +305,7 @@
          <i class="el-icon-s-operation" style="color:#42b983;" /> 设备维修验证信息：
        </div>
        <div style="display: flex;flex-direction: column;margin-left: 40px">
          <div style="margin-bottom: 10px">验证结果：xxx</div>
          <div style="margin-bottom: 10px">验证结果：{{ isResult }}</div>
        </div>
      </div>
      <!--      图片预览对话框-->
@@ -329,11 +347,9 @@

<script>
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import ImportPicker from '@/components/ImportPicker'
import { handleDatetime, validateCode } from '@/utils/global'
import { DeviceRepairTakeOutExcel, DeviceUpdateSearch, DeviceUpdateSubSearch } from '@/api/sbgl'
import { handleDatetime } from '@/utils/global'
import { DeviceUpdateOutExcel, DeviceUpdateSearch, DeviceUpdateSubSearch } from '@/api/sbgl'
import { ShopSearch } from '@/api/dzkb'

export default {
@@ -352,10 +368,10 @@
        eqpcode: '', // 设备编码
        eqpname: '', // 设备名称
        reportuser: '', // 报修人员
        repairuser: '', // 报修时间
        vrifcatuser: '', // 维修人员
        reportdate: '', // 维修时间
        repairdate: '', // 验证人员
        repairuser: '', // 维修人员
        vrifcatuser: '', // 验证人员
        reportdate: '', // 报修时间
        repairdate: '', // 维修时间
        vrifcatdate: '', // 验证时间
        prop: 'repair_code', // 排序字段
        order: 'desc', // 排序字段
@@ -368,6 +384,7 @@
      dialogVisible: false,
      dialogData1: {},
      dialogData2: {},
      isResult: '', // 验证结果
      operation: '',

      baseUrl: 'http://121.196.36.24:8001/', // 图片预览地址前缀
@@ -404,7 +421,35 @@
      })
    },
    async getDeviceUpdateSearch() {
      const res = await DeviceUpdateSearch(this.form)
      let reportdate = this.form.reportdate
      if (reportdate.length > 0) {
        reportdate = handleDatetime(reportdate[0]) + '~' + handleDatetime(reportdate[1])
      }
      let repairdate = this.form.repairdate
      if (repairdate.length > 0) {
        repairdate = handleDatetime(repairdate[0]) + '~' + handleDatetime(repairdate[1])
      }
      let vrifcatdate = this.form.vrifcatdate
      if (vrifcatdate.length > 0) {
        vrifcatdate = handleDatetime(vrifcatdate[0]) + '~' + handleDatetime(vrifcatdate[1])
      }
      const data = {
        wkshopcode: this.form.wkshopcode, // 车间编码
        eqpcode: this.form.eqpcode, // 设备编码
        eqpname: this.form.eqpname, // 设备名称
        reportuser: this.form.reportuser, // 报修人员
        repairuser: this.form.repairuser, // 维修人员
        vrifcatuser: this.form.vrifcatuser, // 验证人员
        reportdate, // 报修时间
        repairdate, // 维修时间
        vrifcatdate, // 验证时间
        prop: 'repair_code', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 20 // 每页多少条
      }

      const res = await DeviceUpdateSearch(data)
      this.tableData = res.data
      this.total = res.count
      return { code: res.code }
@@ -452,12 +497,6 @@
      this.form.vrifcatdate = ''
      this.getDeviceUpdateSearch()
    },

    // 新增按钮
    add(operation) {
      this.operation = operation
      this.dialogVisible = true
    },
    // 修改按钮
    async edit(operation, row) {
      this.operation = operation
@@ -466,6 +505,7 @@
      const { data: res } = await DeviceUpdateSubSearch({ repair_code: row.repair_code })
      this.dialogData1 = res.data1
      this.dialogData2 = res.data2
      this.isResult = row.verify_result
    },
    handlePictureCardPreview(url) {
      this.pictureVisible = true
@@ -478,23 +518,34 @@
    handleClose() {
      this.dialogData1 = {}
      this.dialogData2 = {}
      this.isResult = ''
    },
    async download() {
      // let tempDate = this.form.repairdate
      // if (tempDate.length > 0) {
      //   tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      // }
      // const data = {
      //   wkshopcode: this.form.wkshopcode,
      //   eqpcode: this.form.eqpcode,
      //   eqpname: this.form.eqpname,
      //   stanedname: this.form.stanedname,
      //   repairuser: this.form.repairuser,
      //   repairdate: tempDate,
      //   repairresult: this.form.repairresult
      // }
      // const { data: res } = await DeviceUpdateOutExcel(data)
      // window.location.href = res
      let reportdate = this.form.reportdate
      if (reportdate.length > 0) {
        reportdate = handleDatetime(reportdate[0]) + '~' + handleDatetime(reportdate[1])
      }
      let repairdate = this.form.repairdate
      if (repairdate.length > 0) {
        repairdate = handleDatetime(repairdate[0]) + '~' + handleDatetime(repairdate[1])
      }
      let vrifcatdate = this.form.vrifcatdate
      if (vrifcatdate.length > 0) {
        vrifcatdate = handleDatetime(vrifcatdate[0]) + '~' + handleDatetime(vrifcatdate[1])
      }
      const data = {
        wkshopcode: this.form.wkshopcode, // 车间编码
        eqpcode: this.form.eqpcode, // 设备编码
        eqpname: this.form.eqpname, // 设备名称
        reportuser: this.form.reportuser, // 报修人员
        repairuser: this.form.repairuser, // 维修人员
        vrifcatuser: this.form.vrifcatuser, // 验证人员
        reportdate, // 报修时间
        repairdate, // 维修时间
        vrifcatdate // 验证时间
      }
      const { data: res } = await DeviceUpdateOutExcel(data)
      window.location.href = res
    },
    // 对话框取消
    dialogVisibleCancel() {

 src/views/scgl/gd.vue

@@ -588,6 +588,22 @@
            </el-select>
          </el-form-item>
        </div>
        <el-form-item label="物料清单" prop="bomId">
          <el-select
            v-model="dialogForm.bomId"
            filterable
            :popper-append-to-body="false"
            style="width: 200px;"
            placeholder="请选择"
          >
            <el-option
              v-for="item in bomIdArr"
              :key="item.code"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="计划开始时间" prop="planstartdate">
          <el-date-picker
            v-model="dialogForm.planstartdate"
@@ -623,6 +639,12 @@
              :value="item.code"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="是否排程" prop="isAps">
          <el-radio-group v-model="dialogForm.isAps">
            <el-radio key="Y" label="Y" value="Y">是</el-radio>
            <el-radio key="N" label="N" value="N">否</el-radio>
          </el-radio-group>
        </el-form-item>
      </el-form>

@@ -1630,9 +1652,16 @@
        planstartdate: '', // 计划开始时间
        planenddate: '', // 计划完成时间
        orderlev: '', // 工单等级

        isAps: 'N', // 是否排程
        bomId: '', // 物料清单id
        OperType: '' // 操作类型
      },
      bomIdArr: [// 物料清单下拉  因为接口还没写，暂时用写死的值
        { code: 15, name: 'V5' },
        { code: 14, name: 'V1' },
        { code: 17, name: 'V7' },
        { code: 16, name: 'V6' }
      ],
      ordertypeArr: [// 工单类型
        { code: 'PO', name: '标准工单' },
        { code: 'FO', name: '报废补单' }
@@ -1673,6 +1702,12 @@
        ],
        orderlev: [
          { required: true, message: '请选择工单等级', trigger: ['blur', 'change'] }
        ],
        isAps: [
          { required: true, message: '请选择是否排程', trigger: ['blur', 'change'] }
        ],
        bomId: [
          { required: true, message: '请选择物料清单', trigger: ['blur', 'change'] }
        ]

      },
@@ -1902,8 +1937,21 @@
      this.dialogForm.planstartdate = handleDatetime(new Date())
      this.dialogForm.planenddate = handleDatetime(new Date())
      this.dialogForm.orderlev = 3
    },

      this.dialogForm.bomId = this.getMaxBomId()
    },
    // 查找物料清单里面版本最大的值
    getMaxBomId() {
      let max = 0// 最大值
      let code = ''// 最大值对应的code
      this.bomIdArr.forEach(item => {
        if (parseFloat(item.name.substring(1)) > max) {
          max = parseFloat(item.name.substring(1))
          code = item.code
        }
      })
      return code
    },
    // 产品信息值改变
    async partcodeChange(val) {
      console.log(val, 22)
@@ -1978,6 +2026,8 @@
        this.dialogForm.planstartdate = row.plan_startdate !== null ? row.plan_startdate : handleDatetime(new Date())
        this.dialogForm.planenddate = row.plan_enddate !== null ? row.plan_enddate : handleDatetime(new Date())
        this.dialogForm.orderlev = row.piroque !== null ? row.piroque : 3 // 等级

        this.dialogForm.bomId = this.getMaxBomId() // 暂时写死
      })
    },
    // 删除按钮
@@ -2077,7 +2127,8 @@
      this.dialogForm.planstartdate = '' // 计划开始时间
      this.dialogForm.planenddate = '' // 计划完成时间
      this.dialogForm.orderlev = '' // 工单等级

      this.dialogForm.isAps = 'N' // 是否排程
      this.dialogForm.bomId = this.getMaxBomId()
      this.$refs.dialogForm.clearValidate()
    },
    // 对话框取消
@@ -2109,6 +2160,8 @@
            planstartdate: this.dialogForm.planstartdate, // 计划开始时间
            planenddate: this.dialogForm.planenddate, // 计划完成时间
            orderlev: this.dialogForm.orderlev, // 工单等级
            is_aps: this.dialogForm.isAps, // 是否排程
            bom_id: this.dialogForm.bomId, // 是否排程
            OperType: this.operation === 'add' ? 'Add' : 'Update'
          }
          this.$store.state.app.buttonIsDisabled = true
@@ -2673,12 +2726,12 @@
  margin-bottom: 0;
}

//.elTableDiv {
.elTableDiv {
::v-deep .el-radio__label {
  display: none;
}

//}
}

.el-table::before {
  height: 0;

 src/views/zzmx/wlqd.vue

@@ -15,7 +15,7 @@
          style="display: flex;justify-content: space-between"
        >
          <div class="elForm">
            <el-form-item label="母件编码" style=" display: flex;">
            <el-form-item label="母件编码" label-width="70px" 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="版本编号" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label-width="70px" 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;">