双奇点 1.生产管理bug修改 2.采购台账二维码功能隐藏

gaoluyang

4 天以前 056593f1b3ed16b2b6130ce688cf5575645778e9

双奇点
1.生产管理bug修改
2.采购台账二维码功能隐藏

 src/views/inventoryManagement/stockManagement/index.vue

@@ -14,7 +14,7 @@
              clearable
              @change="handleQuery"
            />
                            <span class="search_title ml10">产品大类：</span>
                            <span class="search_title ml10">产品名称：</span>
                            <el-input
                                v-model="searchForm.productCategory"
                                style="width: 240px"
@@ -35,7 +35,7 @@
            <el-table-column align="center" type="selection" width="55" />
            <el-table-column align="center" label="序号" type="index" width="60" />
            <el-table-column label="入库日期" prop="createTime" width="100" show-overflow-tooltip />
            <el-table-column label="产品大类" prop="productCategory" show-overflow-tooltip />
            <el-table-column label="产品名称" prop="productCategory" show-overflow-tooltip />
            <el-table-column label="规格型号" prop="specificationModel" show-overflow-tooltip />
            <el-table-column label="单位" prop="unit" width="80" show-overflow-tooltip />
            <el-table-column label="入库数量" prop="inboundNum" width="100" show-overflow-tooltip />
@@ -60,7 +60,7 @@
            <span class="search_title ml10">入库日期：</span>
            <el-date-picker v-model="searchForm.timeStr" type="date" placeholder="请选择日期" value-format="YYYY-MM-DD"
              format="YYYY-MM-DD" clearable @change="handleQuery" />
            <span class="search_title ml10">产品大类：</span>
            <span class="search_title ml10">产品名称：</span>
            <el-input v-model="searchForm.productCategory" style="width: 240px" placeholder="请输入" clearable />
            <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
          </div>
@@ -103,7 +103,7 @@
            <span class="search_title ml10">入库日期：</span>
            <el-date-picker v-model="searchForm.timeStr" type="date" placeholder="请选择日期" value-format="YYYY-MM-DD"
              format="YYYY-MM-DD" clearable @change="handleQuery" />
            <span class="search_title ml10">产品大类：</span>
            <span class="search_title ml10">产品名称：</span>
            <el-input v-model="searchForm.productCategory" style="width: 240px" placeholder="请输入" clearable />
            <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
          </div>

 src/views/procurementManagement/procurementLedger/index.vue

@@ -146,7 +146,7 @@
        <el-table-column
          fixed="right"
          label="操作"
          min-width="150"
          min-width="100"
          align="center"
        >
          <template #default="scope">
@@ -158,13 +158,13 @@
                            :disabled="scope.row.receiptPaymentAmount>0 || scope.row.recorderName !== userStore.nickName"
              >编辑</el-button
            >
            <el-button
              link
              type="success"
              size="small"
              @click="showQRCode(scope.row)"
              >生成二维码</el-button
            >
<!--            <el-button-->
<!--              link-->
<!--              type="success"-->
<!--              size="small"-->
<!--              @click="showQRCode(scope.row)"-->
<!--              >生成二维码</el-button-->
<!--            >-->

          </template>
        </el-table-column>

 src/views/productionManagement/productionCosting/index.vue

@@ -171,7 +171,7 @@
        type: "warning",
    })
        .then(() => {
            proxy.download("/basic/customer/export", {}, "生产核算.xlsx");
            proxy.download("/salesLedger/productionAccounting/export", {}, "生产核算.xlsx");
        })
        .catch(() => {
            proxy.$modal.msg("已取消");

 src/views/productionManagement/productionOrder/index.vue

@@ -78,7 +78,7 @@
        width:300
    },
    {
        label: "付款状态",
        label: "生产状态",
        prop: "status",
        dataType: "tag",
        formatType: (params) => {

 src/views/productionManagement/productionReporting/components/formDia.vue

@@ -31,7 +31,7 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="待生产数量：" prop="pendingNum">
              <el-input v-model="form.pendingNum" placeholder="请输入" clearable disabled/>
              <el-input :value="form.pendingNum !== undefined && form.pendingNum !== null ? Number(form.pendingNum).toFixed(2) : ''" placeholder="请输入" clearable disabled/>
            </el-form-item>
          </el-col>
        </el-row>
@@ -88,6 +88,7 @@
const userList = ref([])
const dialogFormVisible = ref(false);
const operationType = ref('')
const pendingFinishNum = ref(0) // 外部传入的待生产数量（剩余可报工数量）
const data = reactive({
  form: {
        successNum: "",
@@ -110,14 +111,21 @@
        userList.value = res.data;
    });
    form.value = {...row}
  pendingFinishNum.value = Number(row?.pendingFinishNum || 0)
  // 将待生产数量带入表单，方便展示与校验，保留两位小数
  form.value.pendingNum = Number(pendingFinishNum.value.toFixed(2))
}

const changeNum = (value) => {
    if (value > form.value.schedulingNum) {
        form.value.finishedNum = form.value.schedulingNum;
        proxy.$modal.msgWarning('本次生产数量不可大于排产数量')
    const maxPending = Number(pendingFinishNum.value) || 0
    // 上限：不能超过待生产数量
    if (Number(value) > maxPending) {
        form.value.finishedNum = Number(maxPending.toFixed(2));
        proxy.$modal.msgWarning('本次生产数量不可大于待生产数量')
    }
    form.value.pendingNum = form.value.schedulingNum - form.value.finishedNum;
    // 重新计算剩余待生产数量，保留两位小数
    const finishedNum = Number(form.value.finishedNum) || 0
    form.value.pendingNum = Number((maxPending - finishedNum).toFixed(2));
}
// 提交产品表单
const submitForm = () => {