tangning преди 2 години
родител
ревизия
c3bb3014d4
променени са 4 файла, в които са добавени 10 реда и са изтрити 6 реда
  1. 1 1
      src/views/work/confirmPriceModal.vue
  2. 7 3
      src/views/work/detail.vue
  3. 1 1
      src/views/work/outModal.vue
  4. 1 1
      src/views/work/quoteModel.vue

+ 1 - 1
src/views/work/confirmPriceModal.vue

@@ -147,7 +147,7 @@
           }
           let price = ele.discount == 1?ele.priceDiscount:ele.price
           valueObj[`priceList${ele.priceListId}`] = ele.count || 0
-          valueObj[`priceListText${ele.priceListId}`] = `${ele.name} ${price} 元/`
+          valueObj[`priceListText${ele.priceListId}`] = `${ele.name} ${price} 元/${ele.partUnit}`
           count = count + ele.count*price
           priceSchema.unshift({
             field: 'priceListText' + ele.priceListId,

+ 7 - 3
src/views/work/detail.vue

@@ -418,19 +418,23 @@ export default defineComponent({
         count: '合计(元)',
         total: 0,
       };
-      dataSource = res.priceList.map((ele) => {
+      let newdataSource = [] 
+      res.priceList.map((ele) => {
+        if(!(ele.type == 0 && ele.status == 0) && ele.laborId != 2){
         let price = ele.discount == 1?ele.priceDiscount:ele.price
         let elePrice = countItem.total + parseFloat(price) * ele.count
         countItem.total = elePrice;
-        return {
+        newdataSource.push({
           // ...ele,
           count: ele.count,
           name: ele.name,
           price: price,
           id: ele.laborId,
           total: (price * ele.count).toFixed(2),
-        };
+        })
+        }
       });
+      dataSource = newdataSource
       priceTotal.value = countItem.total?.toFixed(2)
       countItem.total = res.repairerVo.warrantyType == 0?'0.00':priceTotal.value
       let addItemList = [countItem]

+ 1 - 1
src/views/work/outModal.vue

@@ -111,7 +111,7 @@ export default defineComponent({
     const columns = [
       {
         title: '备件编号',
-        dataIndex: 'partId',
+        dataIndex: 'partNum',
         width: 50,
       },
       {

+ 1 - 1
src/views/work/quoteModel.vue

@@ -201,7 +201,7 @@
           countIndex++
           let price = ele.discount == 1?ele.priceDiscount:ele.price
           valueObj[`priceList${ele.priceListId}`] = ele.count || 0
-          valueObj[`priceListText${ele.priceListId}`] = `${ele.name} ${ele.price} 元/`
+          valueObj[`priceListText${ele.priceListId}`] = `${ele.name} ${ele.price} 元/${ele.partUnit}`
           valueObj[`discount${ele.priceListId}`] = ele.discount == 1?[0]:[]
           count = count + ele.count*price
           priceSchema.push({