loulijun2021
2023-03-03 9c6115340a7cd7e36198a0d0503068a260d30581
1.节拍工价、工单新增控制必须设置计件单价
已修改5个文件
92 ■■■■ 文件已修改
src/api/scgl.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/kb/cjsc.vue 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/kb/zhkb.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/gd.vue 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/jpgj.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/scgl.js
@@ -252,3 +252,12 @@
    data
  })
}
// 工单派发选择工艺路线或选择生产车间时判断绑定条件
export function SelectRouteOrWkshop(data) {
  return request({
    url: 'ProductionManagement/SelectRouteOrWkshop',
    method: 'get',
    params: data
  })
}
src/views/kb/cjsc.vue
@@ -44,7 +44,12 @@
                  prop="partname"
                  width="120"
                  label="产品名称"
                />
                >
                  <template slot-scope="{row}">
                    <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
                    <div v-else>/</div>
                  </template>
                </el-table-column>
                <el-table-column
                  prop="good_qty"
                  label="数量"
@@ -78,7 +83,12 @@
                  prop="partname"
                  width="120"
                  label="产品名称"
                />
                >
                  <template slot-scope="{row}">
                    <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
                    <div v-else>/</div>
                  </template>
                </el-table-column>
                <el-table-column
                  prop="good_qty"
                  label="数量"
@@ -147,6 +157,7 @@
              >
                <template slot-scope="{row}">
                  <div
                    class="ellipsis"
                    :style="{color:row.eqp_name==='装配一线'?'#FFFF77':row.eqp_name==='装配二线'?'#FF8888':row.eqp_name==='装配三线'?'#D28EFF':'#66FFFF'}"
                  > {{ row.partname }}
                  </div>
@@ -167,7 +178,7 @@
              <el-table-column
                prop="plan_startdate"
                label="预计开始"
                width="130"
                width="125"
              >
                <template slot-scope="{row}">
                  <div
@@ -181,7 +192,7 @@
              <el-table-column
                prop="plan_enddate"
                label="预计完工"
                width="130"
                width="125"
              >
                <template slot-scope="{row}">
                  <div
@@ -195,10 +206,11 @@
              <el-table-column
                prop="stepname"
                label="工序"
                width="90"
                width="100"
              >
                <template slot-scope="{row}">
                  <div
                    class="ellipsis"
                    :style="{color:row.eqp_name==='装配一线'?'#FFFF77':row.eqp_name==='装配二线'?'#FF8888':row.eqp_name==='装配三线'?'#D28EFF':'#66FFFF'}"
                  > {{ row.stepname }}
                  </div>
@@ -242,7 +254,12 @@
                  prop="partname"
                  width="120"
                  label="产品名称"
                />
                >
                  <template slot-scope="{row}">
                    <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
                    <div v-else>/</div>
                  </template>
                </el-table-column>
                <el-table-column
                  prop="good_qty"
                  label="数量"
@@ -276,7 +293,12 @@
                  prop="partname"
                  width="120"
                  label="产品名称"
                />
                >
                  <template slot-scope="{row}">
                    <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
                    <div v-else>/</div>
                  </template>
                </el-table-column>
                <el-table-column
                  prop="good_qty"
                  label="数量"
src/views/kb/zhkb.vue
@@ -233,14 +233,19 @@
                />
                <el-table-column
                  prop="linename"
                  width="165"
                  width="125"
                  label="产线"
                />
                <el-table-column
                  prop="partname"
                  width="120"
                  width="160"
                  label="产品"
                />
                >
                  <template slot-scope="{row}">
                    <div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
                    <div v-else>/</div>
                  </template>
                </el-table-column>
                <el-table-column
                  prop="good_qty"
                  label="数量"
src/views/scgl/gd.vue
@@ -578,6 +578,7 @@
              style="width: 200px;"
              placeholder="请选择"
              :disabled="dialogForm.routecode===''"
              @change="wkshopcodeChange"
            >
              <el-option
                v-for="item in wkshopArr"
@@ -684,9 +685,19 @@
          <el-button @click="dialogVisibleCancel">取 消</el-button>
          <!--          <el-button v-if="operation==='add'" type="primary" @click="dialogVisibleConfirmPreview('add')">预览</el-button>-->
          <el-button
            v-if="!sumbitBottonIsDisabled"
            v-waves
            type="primary"
            :loading="$store.state.app.buttonIsDisabled"
            :disabled="$store.state.app.buttonIsDisabled"
            @click="dialogVisibleConfirm"
          >确 定</el-button>
          <el-button
            v-if="sumbitBottonIsDisabled"
            v-waves
            type="primary"
            disabled
            @click="dialogVisibleConfirm"
          >确 定</el-button>
        </div>
@@ -1561,7 +1572,7 @@
  AddUpdateMesOrder,
  ClosedMesOrder,
  DeleteMesOrder, ErpOrderSearch,
  MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep,
  MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep, SelectRouteOrWkshop,
  SelectRouteStep
} from '@/api/scgl'
import { InventoryFileAssociationRoute, PartSelect, SaveInventoryFile } from '@/api/zzmx'
@@ -1793,7 +1804,8 @@
        disabledDate(time) {
          return time.getTime() < Date.now() - 8.64e7
        }
      }
      },
      sumbitBottonIsDisabled: false
    }
  },
  created() {
@@ -1849,6 +1861,20 @@
      // 获取产品信息
      const { data: res1 } = await PartSelect()
      this.partArr = res1
    },
    // 生产车间值改变时
    wkshopcodeChange(val) {
      const data = {
        partcode: this.dialogForm.partcode,
        routecode: this.dialogForm.routecode,
        wkshopcode: val
      }
      SelectRouteOrWkshop(data).then((res) => {
        // console.log(res, 1)
      }).catch(err => {
        // console.log(err, 2)
        this.sumbitBottonIsDisabled = true
      })
    },
    // 订单状态改变时
    erporderstusChange(val) {
@@ -1930,6 +1956,8 @@
      }
      this.dialogForm.wkshopcode = ''
      this.sumbitBottonIsDisabled = false
    },
    // 工艺路线值改变
    async routecodeChange(val) {
@@ -2085,6 +2113,7 @@
      this.dialogForm.orderlev = '' // 工单等级
      this.$refs.dialogForm.clearValidate()
      this.sumbitBottonIsDisabled = false
    },
    // 对话框取消
    dialogVisibleCancel() {
src/views/zzmx/jpgj.vue
@@ -691,6 +691,9 @@
    },
    // 保存行
    async saveRow(row) {
      if (parseFloat(row.unprice) <= 0) {
        return this.$message.info('计件单价必须大于零!')
      }
      const data = {
        partcode: this.eqpTable.partcode, //  产品编码
        routecode: this.eqpTable.routecode, //  工艺路线编码