1.修改bug2.完成保养标准页面的开发

loulijun2021

2022-08-31 436569820a3084dcf90f8156a4f812bc220fbb98

1.修改bug2.完成保养标准页面的开发

 src/api/sbgl.js

@@ -258,6 +258,6 @@
  return request({
    url: 'DeviceManager/SaveDeviceRepairStanedAssociationEqp?repairstand_code=' + repairstand_code,
    method: 'post',
    params: data
    data
  })
}

 src/views/kb/zhkb.vue

@@ -676,7 +676,6 @@
            linename: res1.data[0].linename,
            lineworkcont: res1.data[0].lineworkcont,
            children: res1.data[0].children ? res.data[0].children[count] : []
            // children: res1.data[0].children[count]
          }
          flag1 = false
        }
@@ -706,7 +705,6 @@
            }
          }
        }, 1000 * 3)
        // }, res1.data[0].children && res1.data[0].children.length > 0 ? 1000 * 3 : 1000 * 3)
      } else if (index === 1) {
        let count = 0
        if (flag2) {
@@ -741,31 +739,7 @@
              children: res2.data[0].children ? res2.data[0].children[count] : []
            }
          }
        // }, res2.data[0].children && res2.data[0].children.length > 0 ? 1000 * 3 : 1000 * 10)
        }, 1000 * 3)

        // setInterval(() => {
        //   if (count > 0) {
        //     this.lineContent02 = {
        //       linename: res2.data[0].linename,
        //       lineworkcont: res2.data[0].lineworkcont,
        //       children: res2.data[0].children ? res2.data[0].children[count] : []
        //     }
        //   }
        //   if (res2.data[0].children.length === count++) {
        //     count = 0
        //     LineSearchTopLeftData([item]).then(res => {
        //       res2 = res
        //       this.lineContent02 = {
        //         linename: res2.data[0].linename,
        //         lineworkcont: res2.data[0].lineworkcont,
        //         children: res2.data[0].children ? res2.data[0].children[count] : []
        //       }
        //     })
        //
        //     // this.handleEveryLine(item, index)
        //   }
        // }, res2.data[0].children && res2.data[0].children.length > 0 ? 1000 * 3 : 1000 * 10)
      } else if (index === 2) {
        let count = 0
        if (flag3) {
@@ -797,17 +771,12 @@

          if (res3.data[0].children.length === count++) {
            count = 0
            // LineSearchTopLeftData([item]).then(res => {
            //   res3 = res
            this.lineContent03 = {
              linename: res3.data[0].linename,
              lineworkcont: res3.data[0].lineworkcont,
              children: res3.data[0].children ? res3.data[0].children[count] : []
            }
            // })
            // this.handleEveryLine(item, index)
          }
        // }, res3.data[0].children && res3.data[0].children.length > 0 ? 1000 * 3 : 1000 * 10)
        }, 1000 * 3)
      } else if (index === 3) {
        let count = 0
@@ -846,7 +815,6 @@
              children: res4.data[0].children ? res4.data[0].children[count] : []
            }
          }
        // }, res4.data[0].children && res4.data[0].children.length > 0 ? 1000 * 3 : 1000 * 10)
        }, 1000 * 3)
      }
    },

 src/views/sbgl/bybw.vue

@@ -62,6 +62,7 @@
          <el-table-column
            prop="RowNum"
            width="50"
            fixed
            label="序号"
          />
          <el-table-column

 src/views/sbgl/bybz.vue

@@ -51,6 +51,7 @@
          <el-table-column
            prop="RowNum"
            width="50"
            fixed
            label="序号"
          />
          <el-table-column
@@ -76,19 +77,26 @@
            </template>
          </el-table-column>
          <el-table-column
            prop="iscontr"
            prop="main_cycle"
            label="保养周期"
            sortable="custom"
          />
          >
            <template slot-scope="{row}">
              <div v-if="row.main_cycle==='Y'">年</div>
              <div v-if="row.main_cycle==='S'">季</div>
              <div v-if="row.main_cycle==='M'">月</div>
              <div v-if="row.main_cycle==='W'">周</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="is_checkeqp"
            prop="is_repaireqp"
            label="关联设备"
            sortable="custom"
          >
            <template slot-scope="{row}">
              <i v-if="row.is_checkeqp==='Y'" class="el-icon-share" @click="checkeqpClick(row)" />
              <i v-if="row.is_repaireqp==='Y'" class="el-icon-share" @click="checkeqpClick(row)" />
              <i
                v-if="row.is_checkeqp==='N'"
                v-if="row.is_repaireqp==='N'"
                class="el-icon-share"
                style="color: rgb(180 ,181, 185)"
                @click="checkeqpClick(row)"
@@ -390,7 +398,7 @@
  DeviceCheckStanedAssociationEqp, DeviceRepairItemSelect,
  DeviceRepairStandArdSearch, DeviceRepairStanedAssociationEqp,
  SaveDeviceCheckStanedAssociationEqp, SaveDeviceRepairStanedAssociationEqp,
  ViewDeviceCheckStanedSearch
  ViewDeviceCheckStanedSearch, ViewDeviceRepairStanedSearch
} from '@/api/sbgl'
import $ from 'jquery'

@@ -566,7 +574,7 @@
    // 修改按钮
    edit(operation, row) {
      this.operation = operation
      this.getViewDeviceCheckStanedSearch(row.code)
      this.getViewDeviceRepairStanedSearch(row.code)
      this.dialogVisible = true

      this.$nextTick(() => {
@@ -580,8 +588,8 @@
      // })
    },
    // 修改前请求接口
    async getViewDeviceCheckStanedSearch(checkstand_code) {
      const { data: res } = await ViewDeviceCheckStanedSearch({ checkstand_code })
    async getViewDeviceRepairStanedSearch(repairstand_code) {
      const { data: res } = await ViewDeviceRepairStanedSearch({ repairstand_code     })
      this.tableDataDialog = res.Data

      this.dialogForm.code = res.code
@@ -781,7 +789,7 @@
      this.dialogFormEqp.name = row.name
      this.dialogFormEqp.code = row.code

      const { data: res } = await DeviceRepairStanedAssociationEqp({ checkstand_code: row.code })
      const { data: res } = await DeviceRepairStanedAssociationEqp({ repairstand_code: row.code })
      this.dialogFormEqp.eqpAll = res

      if (this.dialogFormEqp.eqpAll.length > 0) {
@@ -835,6 +843,9 @@
          this.dialogFormEqp.eqpTree = [this.dialogFormEqp.eqpAll[index]]
        }
      })
      this.$nextTick(() => { // 树形回显
        this.$refs.epqTree.setCheckedKeys(this.dialogFormEqp.eqpCodeSelectedArr)
      })
    },
    // 小盒子点击
    myCheckboxInputClick(val) {

 src/views/sbgl/djbw.vue

@@ -71,6 +71,7 @@
          <el-table-column
            prop="RowNum"
            width="50"
            fixed
            label="序号"
          />
          <el-table-column

 src/views/sbgl/djbz.vue

@@ -58,6 +58,7 @@
          <el-table-column
            prop="RowNum"
            width="50"
            fixed
            label="序号"
          />
          <el-table-column
@@ -881,6 +882,9 @@
          this.dialogFormEqp.eqpTree = [this.dialogFormEqp.eqpAll[index]]
        }
      })
      this.$nextTick(() => { // 树形回显
        this.$refs.epqTree.setCheckedKeys(this.dialogFormEqp.eqpCodeSelectedArr)
      })
    },
    // 小盒子点击
    myCheckboxInputClick(val) {
@@ -960,7 +964,7 @@
        })
        this.dialogFormEqp.eqpCodeSelectedArr = [...new Set(this.dialogFormEqp.eqpCodeSelectedArr)]
      }

      console.log(this.dialogFormEqp.eqpCodeSelectedArr, 666)
      // 2.第二种情况当树形   半叶 为零   全叶 为零
      if (halfCheckedKeys.length === 0 && checkedKeys.length === 0) {
        console.log('// 2.第二种情况当树形   半叶 为零   全叶 为零')

 src/views/scgl/scdd.vue

@@ -389,7 +389,7 @@
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="dialogVisibleCancel">取 消</el-button>
          <el-button type="primary" @click="dialogVisibleConfirm">下 达</el-button>
          <el-button type="primary" :disabled="sendButtonIsDisabled" @click="dialogVisibleConfirm">下 达</el-button>
        </div>
      </span>
    </el-dialog>
@@ -669,6 +669,8 @@
      this.dialogForm.markqty = ''
      this.dialogForm.ordernum = ''
      this.dialogForm.relse_qty = ''

      this.sendButtonIsDisabled = false
      this.$refs.dialogForm.clearValidate()
    },
    // 对话框取消
@@ -698,7 +700,7 @@
            'ordernum': this.dialogForm.ordernum,
            'relse_qty': this.dialogForm.relse_qty
          }
          console.log(data)
          this.sendButtonIsDisabled = true
          MarkSaveErpOrder(data).then(res => {
            if (res.code === '200') {
              this.$message.success('下达成功！')

 src/views/scgl/sckbg.vue

@@ -829,8 +829,8 @@
        <el-form-item
          v-if="dialogTitle==='外协收料'"
          label="不良原因："
          prop="badcode"
        >
          <!--          prop="badcode"-->
          <el-select
            v-model="dialogForm.badcode"
            style="width: 200px;"
@@ -1325,7 +1325,8 @@
        operation: getCookie('navTabId')
      },
      badTableDataDialog: [], // 不良对话框table表格
      OperationArr: [] // 人员数组
      OperationArr: [], // 人员数组
      sendButtonIsDisabled: false// 下达按钮是否可点击
    }
  },
  // computed: {

 src/views/wlgl/kwdy.vue

@@ -25,9 +25,6 @@
            <el-form-item label="库位描述" style=" display: flex;">
              <el-input v-model="form.description" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="创建人员" style=" display: flex;">
              <el-input v-model="form.createuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item label="所属仓库" style=" display: flex;">
              <el-select
                v-model="form.stockcode"
@@ -44,6 +41,10 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item label="创建人员" style=" display: flex;">
              <el-input v-model="form.createuser" 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>

 src/views/zzmx/gylx.vue

@@ -432,6 +432,15 @@
        return this.$message.info('此工序已选，请选择其它工序！')
      }

      // this.routeArr.forEach((item, index) => {
      //   console.log(this.autocompleteValue.trim() === item.stepname, 2)
      //   if (this.autocompleteValue.trim() === item.stepname) {
      //     console.log(tag.stepname === item.stepname, 353535)
      //     this.routeArr.splice(index, 1)
      //   }
      // })
      // console.log(this.routeArr, 1)

      // 将值替换到原tag位置上
      this.dynamicTags.forEach((item, index) => {
        if ((index + 1) === tag.seq) {
@@ -577,10 +586,10 @@
    },
    // 重置
    reset() {
      this.form.OrgCode = ''
      this.form.OrgName = ''
      this.form.OrgType = ''
      this.form.UserName = ''
      this.form.routecode = ''
      this.form.routename = ''
      this.form.description = ''
      this.form.createuser = ''
      this.getRouteSearch()
    },