loulijun2021
2022-08-25 955081f4111c7d276bb63d3ee8dacb3e07bc53be
点检标准新增功能实现
已修改3个文件
101 ■■■■■ 文件已修改
src/views/sbgl/djbz.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/scdd.vue 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/sckbg.vue 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sbgl/djbz.vue
@@ -162,13 +162,14 @@
        </el-form>
      </div>
      <div>
        <i class="el-icon-s-operation" style="color:#42b983;margin: -20px 10px 20px 0" />设备点检点检信息
        <i class="el-icon-s-operation" style="color:#42b983;margin: -20px 10px 20px 0" />设备关联点检项信息:
      </div>
      <div style="margin-bottom:10px">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addRow">新增</el-button>
      </div>
      <div class="elTableDiv">
        <el-table
          ref="tableDataDialogRef"
          :data="tableDataDialog"
          :height="(tableHeight-300)+'px'"
          border
@@ -227,12 +228,12 @@
          </el-table-column>
          <el-table-column
            prop="chkdesc"
            prop="checkitem_descr"
            label="点检要求"
          >
            <template slot-scope="{row}">
              <div v-if="row.isVisible===0">{{ row.chkdesc }}</div>
              <el-input v-else v-model="row.chkdesc" />
              <div v-if="row.isVisible===0">{{ row.checkitem_descr }}</div>
              <el-input v-else v-model="row.checkitem_descr" />
            </template>
          </el-table-column>
          <el-table-column
@@ -461,13 +462,18 @@
      this.operation = operation
      this.dialogVisible = true
      this.getDeviceCheckItemSelect()
      this.$nextTick(() => {
        this.$refs.tableDataDialogRef.doLayout()
      })
    },
    // 修改按钮
    edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true
      this.getDeviceCheckItemSelect()
      this.$nextTick(() => {
        this.$refs.tableDataDialogRef.doLayout()
      })
      this.$nextTick(() => {
        this.dialogForm.OrgCode = row.org_code
        this.dialogForm.OrgName = row.org_name
@@ -539,7 +545,7 @@
    },
    selectChange(val, row) {
      row.chkdesc = this.checkItemSelectArr.find(item => {
      row.checkitem_descr = this.checkItemSelectArr.find(item => {
        return item.code === val || item.name === val
      }).description
@@ -565,7 +571,7 @@
      this.tableDataDialog.push({
        checkitem_code: '',
        checkitem_name: '',
        chkdesc: '',
        checkitem_descr: '',
        isscan: 'Y',
        cycle: 'D',
        isVisible: 1
@@ -583,7 +589,7 @@
          this.tableDataDialog.splice(index, 1, {
            checkitem_code: row.checkitem_code,
            checkitem_name: row.checkitem_name,
            chkdesc: row.chkdesc,
            checkitem_descr: row.checkitem_descr,
            isscan: row.isscan,
            cycle: row.cycle,
            isVisible: 1
src/views/scgl/scdd.vue
@@ -236,14 +236,24 @@
            prop="planstartdate"
            label="预计开工时间"
            sortable="custom"
            width="160"
          />
            width="130"
          >
            <template slot-scope="{row}">
              <div v-if="row.planstartdate">{{ row.planstartdate.substring(0,11) }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="planenddate"
            label="预计完工时间"
            sortable="custom"
            width="160"
          />
            width="130"
          >
            <template slot-scope="{row}">
              <div v-if="row.planenddate">{{ row.planenddate.substring(0,11) }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="createuser"
            label="创建人员"
@@ -258,9 +268,14 @@
          <el-table-column
            prop="createdate"
            label="创建时间"
            width="160"
            width="130"
            sortable="custom"
          />
          >
            <template slot-scope="{row}">
              <div v-if="row.createdate">{{ row.createdate.substring(0,11) }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            label="操作"
            fixed="right"
src/views/scgl/sckbg.vue
@@ -145,18 +145,23 @@
              <el-table-column
                prop="plan_startdate"
                label="计划开工日期"
                width="185"
                width="150"
                sortable="custom"
              />
              >
                <template slot-scope="{row}">
                  <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0,11) }}</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
              <el-table-column
                prop="plan_enddate"
                label="计划完工日期"
                width="185"
                width="150"
                sortable="custom"
                fixed="right"
              >
                <template slot-scope="{row}">
                  <div v-if="row.plan_startdate">{{ row.plan_startdate }}</div>
                  <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0,11) }}</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
@@ -339,18 +344,23 @@
              <el-table-column
                prop="plan_startdate"
                label="计划开工日期"
                width="185"
                width="150"
                sortable="custom"
              />
              >
                <template slot-scope="{row}">
                  <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0,11) }}</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
              <el-table-column
                prop="plan_enddate"
                label="计划完工日期"
                width="185"
                width="150"
                sortable="custom"
                fixed="right"
              >
                <template slot-scope="{row}">
                  <div v-if="row.plan_startdate">{{ row.plan_startdate }}</div>
                  <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0,11) }}</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
@@ -415,26 +425,25 @@
              <el-table-column
                prop="wo_code"
                label="工单号"
                width="160"
                min-width="160"
                sortable="custom"
              />
              <el-table-column
                prop="partcode"
                label="产品编码"
                width="110"
                min-width="110"
                sortable="custom"
              />
              <el-table-column
                prop="partname"
                width="160"
                min-width="160"
                label="产品名称"
                show-tooltip-when-overflow
                sortable="custom"
              />
              <el-table-column
                prop="stepname"
                label="工序"
                width="120"
                min-width="120"
                sortable="custom"
              />
              <el-table-column
@@ -620,6 +629,9 @@
            />
          </el-select>
        </el-form-item>
        <!--        <el-form-item v-if="dialogTitle==='自制报工'" label="报工人员:">-->
        <!--          <el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />-->
        <!--        </el-form-item>-->
        <el-form-item v-if="dialogTitle==='自制报工'" label="备注:">
          <el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
        </el-form-item>
@@ -960,7 +972,7 @@
            placeholder="请选择"
          >
            <el-option
              v-for="item in badOperationArr"
              v-for="item in OperationArr"
              :key="item.usercode"
              :label="item.username"
              :value="item.usercode"
@@ -1284,7 +1296,7 @@
        operation: getCookie('navTabId')
      },
      badTableDataDialog: [], // 不良对话框table表格
      badOperationArr: [] // 维修人员数组
      OperationArr: [] // 人员数组
    }
  },
  // computed: {
@@ -1952,17 +1964,11 @@
      const data = {
        Data: this.badTableDataDialog
      }
      // console.log(JSON.stringify(data), 1)
      // console.log(this.badDialogForm.operation, 1)
      // this.badPrintOperator =
      // this.badPrint(this.badOperationArr.find(item => item.usercode === this.badDialogForm.operation).username)
      // this.dialogVisible2 = true
      EditOrderNgStepSeave(data, this.badDialogForm.operation).then(res => {
        if (res.code === '200' || res.code === '301') {
          this.getBadList()
          this.badDialogVisible = false
          this.badPrint(this.badOperationArr.find(item => item.usercode === this.badDialogForm.operation).username)
          this.badPrint(this.OperationArr.find(item => item.usercode === this.badDialogForm.operation).username)
          this.dialogVisible2 = true
          return this.$message.success('保存成功!')
        }
@@ -1991,7 +1997,7 @@
    // 点击维修处理按钮  或  扫描条码的扫描回车事件
    async repairHandle(row) {
      const { data: res1 } = await MesOrderSelectUser({ usercode: '' })
      this.badOperationArr = res1
      this.OperationArr = res1
      console.log(row)
      let data