11

src/views/work/confirmPriceModal.vue

@@ -398,7 +398,7 @@
         }
         let clearFiled = [];
         fileFlow.priceLists.map((ele) => {
-          clearFiled.push(`priceList${ele.priceListId}`, `priceListText${ele.priceListId}`);
+          clearFiled.push(`priceList${ele.priceListId}`, `priceListText${ele.priceListId}`,`remark${ele.priceListId}`);
         });
         removeSchemaByFiled(clearFiled);
         n.value = 1;

src/views/work/quoteModel.vue

@@ -21,7 +21,7 @@
           </div>
         </template>
         <template #del="{ field }">
-          <Icon @click="del(field)" icon="ant-design:close-circle-outlined" :size="18" :class="`mr-2`" />
+          <Icon v-if="(n - 1) == field" @click="del(field)" icon="ant-design:close-circle-outlined" :size="18" :class="`mr-2`" />
           <!-- <Button v-if="(n - 1) == field" @click="del(field)">删除</Button> -->
         </template>
         <template #delList="{ field }">
@@ -191,8 +191,8 @@
       async function updataRepairInfo() {
         let { repairId } = getFieldsValue();
         const { priceLists, count } = await getPriceList({ repairId }); //
-        addPriceItem(priceLists);
         clearInfo(true);
+        addPriceItem(priceLists);
         setTimeout(() => {
           updataCount();
         }, 100);
@@ -521,7 +521,7 @@
             count = count + Number(ele.price);
           }
         });
-        for (let index = 1; index < n.value; index++) {
+        for (let index = 1; index < (n.value + fileFlow.manMadeList.length); index++) {
           if (fromData[`device_${index}`]) {
             let fromPrice = fromData[`device_${index}`];
             count = count + Number(fromPrice);
@@ -545,6 +545,7 @@
             `remark${ele.priceListId}`,
           );
         });
+        indexa = indexa + fileFlow.priceLists.length
         for (let index = 1; index < indexa; index++) {
           clearFiled.push(`deviceTypeId${index}`,`deduction${index}`,`deviceType${index}`, `device_${index}`, `${index}`, `remark${index}`);
         }