Merge branch 'main' of http://47.100.212.83:3000/yangzifeng/shzg_projectManage

src/components/printBill/bill.vue

@@ -25,11 +25,11 @@
           </tr>
           <tr v-if="!isRuKu">
             <td class="label-td">项目编号：</td>
-            <td class="value-td">{{ billAllObj[0]?.xmNo }}</td>
+            <td class="value-td" colspan="3">{{ billAllObj[0]?.xmNo }}</td>
           </tr>
           <tr v-if="!isRuKu">
             <td class="label-td">项目描述：</td>
-            <td class="value-td">{{ billAllObj[0]?.xmMs }}</td>
+            <td class="value-td" colspan="3">{{ billAllObj[0]?.bizType == 1 ? xmMs  : billAllObj[0]?.xmMs }}</td>
           </tr>
           <!-- 如需显示合计项数量，可加在这里，或者保留在下方 -->
         </tbody>
@@ -127,29 +127,22 @@ const props = defineProps({
   },
 });
 
-function isChukuFun(isChuku){
-  // scope.row.isChuku==0?"已入库":(scope.row.isChuku==1?"已出库":"审批中")
-  if(isChuku == 0){
-    return "已入库"
-  } else if(isChuku == 1){
-    return "已出库"
-  }else if(isChuku == 3){
-    return "借料出库"
-  }else if(isChuku == 2){
-    return "审批中"
-  }else if(isChuku == 4){
-    return "入库撤销"
-  }else if(isChuku == 5){
-    return "出库撤销"
-  }
-}
 
 const isRuKu = computed(() => {
   return props.billAllObj[0]?.bizType == 0;
 });
 
-// 获取第一条数据作为头部基础信息来源
+// 获取不同的项目描述
-const header = computed(() => (props.billAllObj && props.billAllObj.length > 0 ? props.billAllObj[0] : {}));
+const xmMs = computed(() => {
+  const validXmMsValues = props.billAllObj
+    .map(item => item.xmMs) // 提取所有 xmMs 属性值
+    .filter(value => !!value); // 过滤掉 null/undefined/空字符串等假值
+  // 3. 去重：得到所有不同的 xmMs 值
+  const uniqueXmMs = [...new Set(validXmMsValues)];
+  // 4. 核心逻辑：多个值用 + 拼接，单个值直接返回，无值返回空字符串
+  return uniqueXmMs.length > 1 ? uniqueXmMs.join('、') : uniqueXmMs[0] || '';
+});
+
 
 // 汇总逻辑
 const summaryList = computed(() => {
@@ -158,7 +151,8 @@ const summaryList = computed(() => {
   props.billAllObj.forEach(item => {
     if (map.has(item.wlNo)) {
       const existing = map.get(item.wlNo);
-      existing.totalQty = (parseFloat(existing.totalQty) + parseFloat(item.realQty));
+      const total =  (parseFloat(existing.totalQty) + parseFloat(item.realQty)) * 100*10000
+      existing.totalQty = total / ( 100 * 10000);
     } else {
       map.set(item.wlNo, {
         ...item,

src/components/storageBill/bill.vue

@@ -145,7 +145,8 @@ const summaryList = computed(() => {
   props.billAllObj.forEach(item => {
     if (map.has(item.wlNo)) {
       const existing = map.get(item.wlNo);
-      existing.totalQty = (parseFloat(existing.totalQty) + parseFloat(item.realQty));
+      const total =  (parseFloat(existing.totalQty) + parseFloat(item.realQty)) * 100*10000
+      existing.totalQty = total / ( 100 * 10000);
     } else {
       map.set(item.wlNo, {
         ...item,

src/views/plan/jh/index.vue

@@ -294,7 +294,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="合同单价" prop="htDj">
-              <el-input v-model="form.htDj" placeholder="请输入合同单价" />
+              <el-input v-model="form.htDj" placeholder="请输入合同单价" @change="htDjChange($event,'htDj')" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -309,7 +309,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="计划交货数量" prop="jhQty">
-              <el-input v-model="form.jhQty" placeholder="请输入计划交货数量" />
+              <el-input v-model="form.jhQty" placeholder="请输入计划交货数量" @change="htDjChange($event,'jhQty')" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -804,6 +804,30 @@ function handlePrint(){
   // Print.print('printMe');
   // showContent.value = false;
 }
+// 合同金额改变
+function htDjChange(e,name) {
+  console.log(e,form.value,name,'e===>');
+  if(e){
+    const htDj = form.value?.htDj
+    const jhQty = form.value?.jhQty 
+    const jhAmt = (Number(htDj) * Number(jhQty)* 100*10000) / ( 100*10000)
+    console.log(jhAmt,'jhAmt==>');
+    if(!(/^-?\d+(\.\d+)?$/.test(e))){
+      if(name == 'htDj'){
+        proxy.$modal.msgError("合同单价请输入数字");
+        return;
+      }
+       if(name == 'jhQty'){
+        proxy.$modal.msgError("计划交货数量请输入数字");
+        return;
+      }
+        form.value.jhAmt=''
+    }else{
+      form.value.jhAmt=jhAmt
+    }
+  }
+
+}
 getList();
 </script>