1.生产开报工新增生产类型

loulijun2021

2022-11-09 ed892500022adbfa8da4bcb5982079533b22a58a

1.生产开报工新增生产类型

 src/layout/components/Sidebar/index.vue

@@ -152,4 +152,7 @@
  color: #ffffff;
  cursor: default;
}
.el-menu{
  background-color: #213145 !important;
}
</style>

 src/views/scgl/gd.vue

@@ -146,8 +146,9 @@
                v-model="radioSelected"
                :label="row.wo_code"
                style="color: transparent;padding-left: 10px;"
                @change.native="getCurrentRow(row.wo_code)"

              />
<!--              @change.native="getCurrentRow(row.wo_code)"-->
            </template>
          </el-table-column>
          <el-table-column
@@ -2528,6 +2529,7 @@
    async   rowClick(row, event, column) {
      console.log(row, event, column)
      console.log(row.wo_code, event, column)
      this.radioSelected = row.wo_code
      const { data: res } = await SearchWorkStep({ wo_code: row.wo_code })
      this.tableDataDetail = res
    },

 src/views/scgl/scdd.vue

@@ -135,6 +135,7 @@
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          @sort-change="sortChange"
          @row-click="rowClick"
        >
          <!--          <el-table-column-->
          <!--            type="selection"-->
@@ -149,8 +150,8 @@
                v-model="radioSelectedId"
                :label="row.id"
                style="color: transparent;padding-left: 10px;"
                @change.native="getCurrentRow(row.id)"
              />
              <!--              @change.native="getCurrentRow(row.id)"-->
            </template>
          </el-table-column>
          <el-table-column
@@ -587,6 +588,9 @@
    getCurrentRow(id) {
      this.radioSelectedId = id
    },
    rowClick(row) {
      this.radioSelectedId = row.id
    },
    // 订单关闭
    async orderClose() {
      if (this.radioSelectedId.length < 1) {

 src/views/scgl/sckbg.vue

@@ -563,7 +563,22 @@
        <el-form-item v-if="dialogTitle==='自制报工'" label="下道工序：">
          <div style="width: 200px">{{ dialogForm.nextstepname }}</div>
        </el-form-item>
        <el-form-item v-if="dialogTitle==='自制报工'" prop="usergroupcode" label="生产班组：">
        <el-form-item v-if="dialogTitle==='自制报工'" prop="productionType" label="生产类型：">
          <el-select
            v-model="dialogForm.productionType"
            style="width: 200px;"
            placeholder="请选择"
            @change="usergroupChange111"
          >
            <el-option
              v-for="item in productionTypeSelect"
              :key="item.code"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </el-form-item>
        <el-form-item v-if="dialogTitle==='自制报工'" :prop="dialogForm.productionType==='personal'?'':'usergroupcode'" label="生产班组：">
          <el-select
            v-model="dialogForm.usergroupcode"
            style="width: 200px;"
@@ -1254,9 +1269,14 @@
        startqtySum: '', // 不能超过的数值

        operation: getCookie('navTabId'), // 报工人（收料人）
        remarks: ''// 备注
        remarks: '', // 备注

        productionType: 'personal'// 生产类型
      },
      productionTypeSelect: [
        { code: 'personal', name: '个人类型' },
        { code: 'team', name: '班组类型' }
      ], // 生产类型数组
      ZZuserArr: [], // 自制用户所有
      ZZtreams: [], // 自制生产班组数组
      ZZeqpArr: [], // 自制设备名称
@@ -1297,6 +1317,9 @@
        ],
        startqty: [
          { required: true, message: '请输入报工数量', trigger: ['blur', 'change'] }
        ],
        productionType: [
          { required: true, message: '请选择生产类型', trigger: ['blur', 'change'] }
        ]
      },
      activeName: '',
@@ -1397,6 +1420,13 @@
    this.getMesOrderSelectUserAll() // 获取所有人员
  },
  methods: {
    // 选择生产类型
    usergroupChange111(val) {
      console.log(val)
      if (val === 'personal') {
        this.dialogForm.usergroupcode = ''
      }
    },

    tableRowClassName({ row, rowIndex }) {
      return 'custom-row'
@@ -1822,6 +1852,10 @@
    },
    // 用户添加
    userAdd() {
      if (this.userTableData.find(i => i.isVisible === 1)) {
        return this.$message.info('请先保存当前行信息！')
      }

      let number = Math.random() * Math.random()// 作为删除时的标识符
      number = number === 0 ? (10 + Math.random()) : number
      console.log(this.userTableData, 6)

 src/views/zzmx/jpgj.vue

@@ -150,6 +150,7 @@
            prop="wksp_name"
            label="生产车间"
            min-width="110"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
@@ -163,12 +164,13 @@
            prop="stepname"
            label="加工工序"
            sortable="custom"
            min-width="110"
            min-width="90"
          />
          <el-table-column
            prop="eqp_name"
            label="加工设备"
            label="加工设备/供方"
            min-width="110"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
@@ -344,23 +346,25 @@
          />
          <el-table-column
            prop="eqpcode"
            label="设备编码"
            :label="eqpTable.steptype==='Z'?'设备编码':'外协供方编码'"
            sortable="custom"
            min-width="110"
          />
          <el-table-column
            prop="eqpname"
            label="设备名称"
            :label="eqpTable.steptype==='Z'?'设备名称':'外协供方名称'"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            v-if="eqpTable.steptype==='Z'"
            prop="wksp_name"
            sortable="custom"
            label="生产车间"
            min-width="110"
          />
          <el-table-column
            v-if="eqpTable.steptype==='Z'"
            sortable="custom"
            prop="eqp_value"
            label="设备节拍"
@@ -380,6 +384,7 @@
            </template>
          </el-table-column>
          <el-table-column
            v-if="eqpTable.steptype==='Z'"
            prop="stand_value"
            label="生产节拍"
            sortable="custom"
@@ -390,6 +395,7 @@
            </template>
          </el-table-column>
          <el-table-column
            v-if="eqpTable.steptype==='Z'"
            prop="cavity_qty"
            label="腔型数"
            sortable="custom"
@@ -533,10 +539,11 @@
        partcode: '',
        routecode: '',
        stepcode: '',
        steptype: '',
        page: 1,
        rows: 10,
        prop: 'eqpcode',
        order: 'desc'
        order: 'asc'
      },
      eqpTableLength: 0,
      isEqpTableEdit: true,
@@ -665,10 +672,15 @@
    },
    async getEqpTable(val) {
      if (typeof val === 'string') {
        console.log('执行1')
        this.eqpTable.steptype = this.stepDialogArr.find(item => item.name === val).flag
        this.eqpTable.partcode = this.dialogForm.partcode
        this.eqpTable.routecode = this.dialogForm.routecode
        this.eqpTable.stepcode = this.stepDialogArr.find(item => item.name === val).code
      } else if (typeof val === 'number') {
        console.log('执行2')
        // console.log(this.stepDialogArr)
        this.eqpTable.steptype = this.stepDialogArr[0].flag
        this.eqpTable.partcode = this.dialogForm.partcode
        this.eqpTable.routecode = this.dialogForm.routecode
        this.eqpTable.stepcode = this.stepDialogArr[0].code

 vue.config.js

@@ -50,7 +50,7 @@
    },
    proxy: {
      [process.env.VUE_APP_BASE_API]: {
        target: 'http://121.196.36.24:8003', // 请求的第三⽅接⼝地址      本地服务器(灵翔)
        target: 'http://121.196.36.24:8005', // 请求的第三⽅接⼝地址      本地服务器(灵翔)
        // target: 'http://192.168.2.138:8001', // 请求的第三⽅接⼝地址   客户服务器(灵翔)
        changeOrigin: true, // 请求跨域时，需 配置此项
        pathRewrite: { // 路径重写,替换target中的请求地址