Merge branch 'sxw-skeleton' of http://101.36.160.140:21044/emergency-report/report-vue into sxw-skeleton

src/views/InformationFilling/enterWarehouseInfo/detail.vue

@@ -56,8 +56,12 @@
       </el-table-column>
       <el-table-column prop="totalPrice" label="价值(万元)" align="center" width="114">
         <template #default="scope">
-          {{ (scope.row.quantity)*(scope.row.unitPrice)/10000 ? (scope.row.quantity)*(scope.row.unitPrice)/10000 : 0 }}
-          <!-- <el-input v-model="scope.row.totalPrice" size="small"></el-input> -->
+          <span v-if="scope.row.materialTree && wanJson.indexOf(scope.row.materialTree[3]) == -1">
+            {{ (scope.row.quantity)*(scope.row.unitPrice)/10000 ? (scope.row.quantity)*(scope.row.unitPrice)/10000 : 0 }}
+          </span>
+          <span v-else>
+            {{ (scope.row.quantity)*(scope.row.unitPrice) ? (scope.row.quantity)*(scope.row.unitPrice) : 0 }}
+          </span>
         </template>
       </el-table-column>
       <el-table-column prop="isAvailable" label="是否可用" align="center" width="120">
@@ -120,6 +124,8 @@ import { useDict } from '@/hooks/dict';
 const { indound_type, is_available, province_ch } = useDict('indound_type', 'is_available', 'province_ch');
 
 const props = defineProps(['id','type'])
+// 价值计算带万
+const wanJson = ['118', '122', '124', '132', '182', '184']
 
 const tableData = ref([{}]);
 const wzOptions = ref([])
@@ -178,14 +184,21 @@ const saveSubmit = (status) => {
     isAvailable: tabData0.isAvailable,
     inboundMaterialInfos: tableData.value
   }
-  postData.inboundMaterialInfos = tableData.value.map(({filePartList, ...item}) => ({
-    ...item,
-    materialGroup: item.materialTree[0],
-    materialType: item.materialTree[1],
-    materialName: item.materialTree[2],
-    unit: item.materialTree[3],
-    totalPrice: (item.quantity)*(item.unitPrice)/10000 ? (item.quantity)*(item.unitPrice)/10000 : 0
-  }));
+  postData.inboundMaterialInfos = tableData.value.map(function({filePartList, ...item}){
+    let totalPrice = (item.quantity)*(item.unitPrice) ? (item.quantity)*(item.unitPrice) : 0
+    if(wanJson.indexOf(item.materialTree[3]) == -1){
+      totalPrice = (item.quantity)*(item.unitPrice)/10000 ? (item.quantity)*(item.unitPrice)/10000 : 0
+    }
+    let returnData = {
+      ...item,
+      materialGroup: item.materialTree[0],
+      materialType: item.materialTree[1],
+      materialName: item.materialTree[2],
+      unit: item.materialTree[3],
+      totalPrice: totalPrice
+    }
+    return returnData;
+  });
   if(props.id){
     updateInData(postData).then((res: any) => {
       if (res.code === 0) {

src/views/InformationFilling/outIssue/detail.vue

@@ -71,8 +71,12 @@
       </el-table-column>
       <el-table-column prop="totalPrice" label="价值(万元)" align="center" width="114">
         <template #default="scope">
-          {{ (scope.row.quantity)*(scope.row.unitPrice)/10000 ? (scope.row.quantity)*(scope.row.unitPrice)/10000 : 0 }}
-          <!-- <el-input v-model="scope.row.totalPrice" size="small"></el-input> -->
+          <span v-if="scope.row.materialTree && wanJson.indexOf(scope.row.materialTree[3]) == -1">
+            {{ (scope.row.quantity)*(scope.row.unitPrice)/10000 ? (scope.row.quantity)*(scope.row.unitPrice)/10000 : 0 }}
+          </span>
+          <span v-else>
+            {{ (scope.row.quantity)*(scope.row.unitPrice) ? (scope.row.quantity)*(scope.row.unitPrice) : 0 }}
+          </span>
         </template>
       </el-table-column>
       <el-table-column prop="isAvailable" label="是否可用" align="center" width="120">
@@ -135,6 +139,8 @@ import { useDict } from '@/hooks/dict';
 const { outdound_type, is_available, province_ch } = useDict('outdound_type', 'is_available', 'province_ch');
 
 const props = defineProps(['id','type'])
+// 价值计算带万
+const wanJson = ['118', '122', '124', '132', '182', '184']
 
 const tableData = ref([{}]);
 const wzOptions = ref([])
@@ -214,14 +220,21 @@ const saveSubmit = (status) => {
     deptId: formData.value.deptId,
     warehouse: showCh(formData.value.deptId, dcckOptions.value)
   }
-  postData.outboundMaterialInfos = tableData.value.map(({filePartList, ...item}) => ({
-    ...item,
-    materialGroup: item.materialTree[0],
-    materialType: item.materialTree[1],
-    materialName: item.materialTree[2],
-    unit: item.materialTree[3],
-    totalPrice: (item.quantity)*(item.unitPrice)/10000 ? (item.quantity)*(item.unitPrice)/10000 : 0
-  }));
+  postData.outboundMaterialInfos = tableData.value.map(function({filePartList, ...item}){
+    let totalPrice = (item.quantity)*(item.unitPrice) ? (item.quantity)*(item.unitPrice) : 0
+    if(wanJson.indexOf(item.materialTree[3]) == -1){
+      totalPrice = (item.quantity)*(item.unitPrice)/10000 ? (item.quantity)*(item.unitPrice)/10000 : 0
+    }
+    let returnData = {
+      ...item,
+      materialGroup: item.materialTree[0],
+      materialType: item.materialTree[1],
+      materialName: item.materialTree[2],
+      unit: item.materialTree[3],
+      totalPrice: totalPrice
+    }
+    return returnData;
+  });
   if(props.id){
     updateOutData(postData).then((res: any) => {
       if (res.code === 0) {

src/views/InformationFilling/outWarehouseInfo/detail.vue

@@ -64,8 +64,12 @@
       </el-table-column>
       <el-table-column prop="totalPrice" label="价值(万元)" align="center" width="114">
         <template #default="scope">
-          {{ (scope.row.quantity)*(scope.row.unitPrice)/10000 ? (scope.row.quantity)*(scope.row.unitPrice)/10000 : 0 }}
-          <!-- <el-input v-model="scope.row.totalPrice" size="small"></el-input> -->
+          <span v-if="scope.row.materialTree && wanJson.indexOf(scope.row.materialTree[3]) == -1">
+            {{ (scope.row.quantity)*(scope.row.unitPrice)/10000 ? (scope.row.quantity)*(scope.row.unitPrice)/10000 : 0 }}
+          </span>
+          <span v-else>
+            {{ (scope.row.quantity)*(scope.row.unitPrice) ? (scope.row.quantity)*(scope.row.unitPrice) : 0 }}
+          </span>
         </template>
       </el-table-column>
       <el-table-column prop="isAvailable" label="是否可用" align="center" width="120">
@@ -129,6 +133,8 @@ import { useDict } from '@/hooks/dict';
 const { outdound_type, is_available, province_ch } = useDict('outdound_type', 'is_available', 'province_ch');
 
 const props = defineProps(['id','type'])
+// 价值计算带万
+const wanJson = ['118', '122', '124', '132', '182', '184']
 
 const tableData = ref([{}]);
 const wzOptions = ref([])
@@ -191,14 +197,21 @@ const saveSubmit = (status) => {
     isAvailable: tabData0.isAvailable,
     outboundMaterialInfos: tableData.value
   }
-  postData.outboundMaterialInfos = tableData.value.map(({filePartList, ...item}) => ({
-    ...item,
-    materialGroup: item.materialTree[0],
-    materialType: item.materialTree[1],
-    materialName: item.materialTree[2],
-    unit: item.materialTree[3],
-    totalPrice: (item.quantity)*(item.unitPrice)/10000 ? (item.quantity)*(item.unitPrice)/10000 : 0
-  }));
+  postData.outboundMaterialInfos = tableData.value.map(function({filePartList, ...item}){
+    let totalPrice = (item.quantity)*(item.unitPrice) ? (item.quantity)*(item.unitPrice) : 0
+    if(wanJson.indexOf(item.materialTree[3]) == -1){
+      totalPrice = (item.quantity)*(item.unitPrice)/10000 ? (item.quantity)*(item.unitPrice)/10000 : 0
+    }
+    let returnData = {
+      ...item,
+      materialGroup: item.materialTree[0],
+      materialType: item.materialTree[1],
+      materialName: item.materialTree[2],
+      unit: item.materialTree[3],
+      totalPrice: totalPrice
+    }
+    return returnData;
+  });
   if(props.id){
     updateOutData(postData).then((res: any) => {
       if (res.code === 0) {