修改bug

2025-09-02 20:37:07 +08:00
parent 85e5572e53
commit 26e4c899db
7 changed files with 27 additions and 39 deletions
--- a/.env.development
+++ b/.env.development
@ -6,7 +6,7 @@ VITE_APP_ENV = 'development'

 # 开发环境
 # 李陈杰 209
-VITE_APP_BASE_API = 'http://192.168.110.180:8899'
+VITE_APP_BASE_API = 'http://192.168.110.209:8899'
 # 曾涛
 # VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # 罗成
--- a/src/views/contract/division/index.vue
+++ b/src/views/contract/division/index.vue
@ -337,18 +337,10 @@ const getVersionNums = async () => {
        getSheetName();
      } else {
        treeForm.value.versions = '';
-        ElMessage({
-          message: '获取版本号失败',
-          type: 'warning'
-        });
      }
    }
  } catch (error) {
    console.log(error);
-    ElMessage({
-      message: '获取版本号失败',
-      type: 'warning'
-    });
  }
 };
 //获取表名
--- a/src/views/contract/limitPrice/index.vue
+++ b/src/views/contract/limitPrice/index.vue
@ -150,18 +150,10 @@ const getVersionNums = async () => {
        getSheetName();
      } else {
        queryForm.value.versions = '';
-        ElMessage({
-          message: '获取版本号失败',
-          type: 'warning'
-        });
      }
    }
  } catch (error) {
    console.log(error);
-    ElMessage({
-      message: '获取版本号失败',
-      type: 'warning'
-    });
  }
 };
 //选择版本号
--- a/src/views/design/billofQuantities/index.vue
+++ b/src/views/design/billofQuantities/index.vue
@ -6,7 +6,7 @@
        <el-card v-if="index < 3" shadow="always">
          <el-form :model="state.queryForm" :inline="true">
            <el-form-item label="版本号" prop="versions">
-              <el-select v-model="state.queryForm.versions" placeholder="选择版本号">
+              <el-select v-model="state.queryForm.versions" placeholder="选择版本号" @change="handleChangeVersion">
                <el-option v-for="item in state.options" :key="item.versions" :label="item.versions" :value="item.versions" />
              </el-select>
            </el-form-item>
@ -166,6 +166,7 @@ const handleTabChange = (tab) => {
 onMounted(async () => {
  await getVersionNums();
 });
+
 // 获取版本号
 async function getVersionNums(isSheet = true) {
  try {
@ -242,10 +243,10 @@ async function handleSheetName() {

 // 获取列表
 async function handleQueryList(isSheet = true) {
-  if (isSheet && !state.queryForm.sheet) {
-    console.warn('表名不存在，无法获取列表数据');
-    return;
-  }
+  // if (isSheet && !state.queryForm.sheet) {
+  //   console.warn('表名不存在，无法获取列表数据');
+  //   return;
+  // }

  try {
    state.loading.list = true;
--- a/src/views/materials/materialsEquipment/materialIssue/index.vue
+++ b/src/views/materials/materialsEquipment/materialIssue/index.vue
@ -126,11 +126,11 @@
                  <el-col :span="12">
                    <el-form-item
                      label="名称"
-                      :prop="`itemList.${index}.name`"
+                      :prop="`itemList.${index}.materialsId`"
                      :rules="[{ required: true, message: '名称不能为空', trigger: 'blur' }]"
                    >
-                      <el-select v-model="item.inventoryId" placeholder="请选择名称" @change="(value) => getNameChange(value, index, item)">
-                        <el-option v-for="opt in optionsName" :key="opt.id" :label="opt.materialsName" :value="opt.id" />
+                      <el-select v-model="item.materialsId" placeholder="请选择名称" @change="(value) => getNameChange(value, index, item)">
+                        <el-option v-for="opt in optionsName" :key="opt.id" :label="`${opt.materialsName}_${opt.createTime}`" :value="opt.id" />
                      </el-select>
                    </el-form-item>
                  </el-col>
@ -171,13 +171,9 @@
                  </el-col> -->
                  <el-col :span="12">
                    <el-form-item label="领取" :prop="`itemList.${index}.issuedQuantity`">
-                      <el-input
-                        v-model.number="item.issuedQuantity"
-                        disabled
-                        placeholder="请输入领取数量"
-                        @input="handleIssuedChange(index)"
-                        @blur="handleIssuedChange(index)"
-                      />
+                      <el-select v-model="item.issuedQuantity" placeholder="请选择数量">
+                        <el-option v-for="opt in item.outList" :key="opt.id" :label="opt.number" :value="opt.number" />
+                      </el-select>
                    </el-form-item>
                  </el-col>
                  <!-- <el-col :span="12">
@ -311,6 +307,7 @@ const getInitFormData = () => {
    itemList: [
      {
        id: undefined,
+
        specification: undefined,
        unit: undefined,
        stockQuantity: undefined,
@ -318,7 +315,8 @@ const getInitFormData = () => {
        remainingQuantity: undefined,
        name: undefined, // 数量验收的名称
        remark: undefined,
-        materialsId: undefined
+        materialsId: undefined,
+        outList: []
      }
    ]
  };
@ -369,7 +367,7 @@ const computeMaterialName = () => {
    .map((item) => item.name.trim())
    .filter((name, index, self) => self.indexOf(name) === index); // 去重（如需保留重复则删除这行）

-  form.value.materialName = validNames.join(',');
+  // form.value.materialName = validNames.join(',');
 };

 /** 查询物料领料单列表 */
@ -408,6 +406,7 @@ const getNameChange = (value, index, item) => {
    item.unit = selected.weightId;
    item.issuedQuantity = selected.number;
    item.stockQuantity = Number(selected.inventoryNumber) || 0;
+    item.outList = selected.outList || [];
    // calculateRemaining(index); // 计算剩余数量
  }
 };
@ -620,6 +619,7 @@ const submitForm = () => {
            remainingQuantity: Number(item.remainingQuantity)
          }))
        };
+        console.log('提交数据:', submitData);

        if (form.value.id) {
          await updateMaterialIssue(submitData);
@ -661,10 +661,13 @@ const addItem = () => {
 // 删除数量验收条目
 const removeItem = (index: number) => {
  if (form.value.itemList.length > 1) {
+    console.log(111111);
+    console.log(itemWatchStopFns.value[index]);
+
    // 停止该条目的监听
-    if (itemWatchStopFns.value[index]) {
-      itemWatchStopFns.value[index]();
-    }
+    // if (itemWatchStopFns.value[index]) {
+    //   itemWatchStopFns.value[index]();
+    // }
    form.value.itemList.splice(index, 1);
    itemWatchStopFns.value.splice(index, 1);
    // 删除后重新计算材料名称
--- a/src/views/materials/materialsEquipment/materialIssue/word/index.vue
+++ b/src/views/materials/materialsEquipment/materialIssue/word/index.vue
@ -42,7 +42,7 @@
            <thead>
              <tr>
                <th colspan="2">领料单位</th>
-                <td class="th-bg" colspan="2">{{ formData.placeholder }}</td>
+                <td class="th-bg" colspan="2">{{ formData.issueUnit }}</td>
                <th colspan="2">保管单位</th>
                <td class="th-bg" colspan="2">{{ formData.storageUnit }}</td>
              </tr>
--- a/src/views/tender/bidd/index.vue
+++ b/src/views/tender/bidd/index.vue
@ -139,7 +139,7 @@ const sheets = ref([]);
 const options = ref([]);
 const tableData = ref([]);
 const tableRef = ref();
-const isExpandAll = ref(false);
+const isExpandAll = ref(true);
 const loading = ref(false);
 const versionMap = new Map();