1.生产管理、报表管理引入分车间概念

loulijun2021

2023-06-17 ff76b3ed3494474e9301c49cf635f1553d49ecc5

 src/views/produceManager/produceStartOrder.vue

@@ -542,7 +542,7 @@
          <div style="width: 200px">{{ dialogForm.partname }}</div>
        </el-form-item>
        <el-form-item label="产品规格：" style="margin: 0 10px 0 0">
          <div style="width: 200px">{{ dialogForm.partspec }}</div>
          <div style="width: 200px">{{ dialogForm.partspec?dialogForm.partspec:'/' }}</div>
        </el-form-item>
        <el-form-item label="当前工序：" style="margin: 0 10px 0 0">
          <div style="width: 200px">{{ dialogForm.stepname }}</div>
@@ -594,6 +594,14 @@
          <div style="width: 200px">{{ dialogForm.nextstepname }}</div>
        </el-form-item>

        <el-form-item v-if="dialogTitle==='自制报工'" label="车间名称：">
          <div style="width: 200px">{{ dialogForm.wkshopname }}</div>
        </el-form-item>

        <el-form-item v-if="dialogTitle==='自制报工'" label="设备名称：" style="margin: 0 10px 0 0">
          <div style="width: 200px">{{ dialogForm.eqpname }}</div>
        </el-form-item>

        <el-form-item v-if="dialogTitle==='自制报工'" prop="reckway" label="计件方式：">

          <el-radio-group v-model="dialogForm.reckway" style="width: 200px;" @change="reckwayChange">
@@ -634,20 +642,20 @@
          </el-select>
        </el-form-item>

        <el-form-item v-if="dialogTitle==='自制报工'" label="设备名称：" prop="eqpcode">
          <el-select
            v-model="dialogForm.eqpcode"
            style="width: 200px;"
            placeholder="请选择"
          >
            <el-option
              v-for="item in ZZeqpArr"
              :key="item.code"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </el-form-item>
        <!--        <el-form-item v-if="dialogTitle==='自制报工'" label="设备名称：" prop="eqpcode">-->
        <!--          <el-select-->
        <!--            v-model="dialogForm.eqpcode"-->
        <!--            style="width: 200px;"-->
        <!--            placeholder="请选择"-->
        <!--          >-->
        <!--            <el-option-->
        <!--              v-for="item in ZZeqpArr"-->
        <!--              :key="item.code"-->
        <!--              :label="item.name"-->
        <!--              :value="item.code"-->
        <!--            />-->
        <!--          </el-select>-->
        <!--        </el-form-item>-->
        <el-form-item v-if="dialogTitle==='自制报工'" label="合格数量：" prop="startqty">
          <el-input v-model="dialogForm.startqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
          <!--          <el-input v-model="dialogForm.noreportqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />-->
@@ -784,7 +792,7 @@
            :page.sync="Userform.page"
            :limit.sync="Userform.rows"
            align="right"
            layout="total,prev, pager, next,sizes,jumper"
            layout="total,prev, pager, next,sizes"
            popper-class="select_bottom"
            @pagination="getMesOrderStepSearch"
          />
@@ -851,12 +859,13 @@
            v-model="dialogForm.wxcode"
            style="width: 200px;"
            placeholder="请选择"
            @change="wxCodeChange"
          >
            <el-option
              v-for="item in WXouterprovide"
              :key="item.code"
              :label="item.name"
              :value="item.code"
              v-for="item in WXouterprovide2"
              :key="item.Name"
              :label="item.tp"
              :value="item.Name"
            />
          </el-select>
        </el-form-item>
@@ -939,6 +948,32 @@
          <el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
        </el-form-item>
      </el-form>
      <div v-if="dialogTitle==='外协收料'" style="display: flex;flex-direction: column">
        <!--明天接着写外协收料，供应商对应的已收未收详情-->
        <div style="height: 30px;margin-left:30px;">
          可收料供应商：
        </div>

        <div
          v-for="(item,index) in dialogForm.list"
          v-if="item.acceptQty>0"
          :key="item.Name"
          style="display: flex;line-height: 26px;height: 26px;margin-left:30px;align-items: center"
        >
          <div
            style="color: #fff;width: 22px;height: 22px;display: flex;justify-content: center;align-items: center;border-radius: 50%"
            :style="{backgroundColor:$store.state.settings.theme}"
          >{{ index+1 }}</div>
          <div style="margin-left:30px;width: 160px;" class="ellipsis">
            {{ item.tp }}
          </div>
          <div style="margin-left:30px;">
            可收数量：{{ item.acceptQty }}
          </div>
        </div>

      </div>

      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button v-waves @click="dialogVisibleCancel">取 消</el-button>
@@ -1098,7 +1133,7 @@
          <div style="width: 200px">{{ badDialogForm.partname }}</div>
        </el-form-item>
        <el-form-item label="产品规格：">
          <div style="width: 200px">{{ badDialogForm.partspec }}</div>
          <div style="width: 200px">{{ badDialogForm.partspec?badDialogForm.partspec:'/' }}</div>
        </el-form-item>
        <el-form-item label="当前工序：">
          <div style="width: 200px">{{ badDialogForm.stepname }}</div>
@@ -1380,6 +1415,7 @@
      ZZeqpArr: [], // 自制设备名称
      badArr: [], // 不良原因数组
      WXouterprovide: [], // 外协供方数组
      WXouterprovide2: [], // 外协供方收料数组
      WXoutuser: [], // 发料人员数组
      userTableData: [], // 人员列表
      UserTotal: 0,
@@ -1821,6 +1857,12 @@

        this.dialogForm.startqtySum = obj.noreportqty

        this.dialogForm.eqpname = obj.eqpname
        this.dialogForm.eqpcode = obj.eqpcode

        this.dialogForm.wkshopcode = obj.wkshopcode
        this.dialogForm.wkshopname = obj.wkshopname

        this.$refs.userTableDataRef.doLayout()
      })

@@ -1859,11 +1901,24 @@
      await this.getMesOrderStepSelectWX()
      await this.getMesOrderSelectUser()
    },
    wxCodeChange(val) {
      this.dialogForm.sqty = this.WXouterprovide2.find(i => i.Name === val).acceptQty
    },
    // 外协收料
    async WXback(obj) {
      // if (this.WXform.orderstepqrcode === '') {
      //   return this.$message.info('请先输入工序！')
      // }
      this.WXouterprovide2 = []
      obj.list.forEach(i => {
        i.acceptQty = parseFloat(i.fqty) - parseFloat(i.sqty) - parseFloat(i.ng_qty) - parseFloat(i.bad_qty)
        if (i.acceptQty > 0) {
          this.WXouterprovide2.push(i)
        }
      })

      console.log(this.WXouterprovide2, 2)

      this.dialogTitle = '外协收料'
      this.dialogVisible = true

@@ -1887,6 +1942,8 @@
        this.dialogForm.sqty = obj.startqty

        this.dialogForm.startqtySum = obj.startqty

        this.dialogForm.list = obj.list
      })
      await this.getMesOrderStepSelectWX()
      await this.getMesOrderSelectUser()
@@ -1899,7 +1956,7 @@
    },
    // 获取自制报工生产班组下拉列表
    async getMesOrderStepReportSelectUserGroup() {
      const { data: res } = await MesOrderStepReportSelectUserGroup()
      const { data: res } = await MesOrderStepReportSelectUserGroup({ wkshopcode: this.dialogForm.wkshopcode })
      this.ZZtreams = res
    },
    // 获取自制报工表格user所有
@@ -2160,6 +2217,10 @@
              return this.$message.info('收料数量加不良数量不能大于了未收数量!')
            }

            if (this.WXouterprovide2.find(i => i.Name === this.dialogForm.wxcode).acceptQty < parseFloat(this.dialogForm.sqty) + parseFloat(this.dialogForm.noputqty)) {
              return this.$message.info('收料数量加不良数量不能大于该供应商可收数量!')
            }

            if (parseFloat(this.dialogForm.noputqty) > 0) {
              if (this.dialogForm.badcode.length < 1) {
                return this.$message.info('请选择不良原因！')