质保期

src/BIZComponents/inventoryTable.vue

@@ -462,6 +462,7 @@
             style="width: 140px"
             :disabled="isContractId"
             v-model="scope.row.customerExpectDeliveryDeadline"
+            @change="setDeliveryDays(scope.row, scope.$index, 'guaranteePeriod')"
             type="date"
             placeholder="选择日期"
           >
@@ -1084,7 +1085,7 @@
               this.form.datasource[i],
               'guaranteePeriodDeadline',
               guaranteePeriodUnitName != 'second'
-                ? this.setDay(item.guaranteePeriod, guaranteePeriodUnitName)
+                ? this.setDay(item.guaranteePeriod, guaranteePeriodUnitName,item)
                 : ''
             );
             // }
@@ -1100,7 +1101,7 @@
             this.form.datasource[index],
             'guaranteePeriodDeadline',
             guaranteePeriodUnitName != 'second'
-              ? this.setDay(row.guaranteePeriod, guaranteePeriodUnitName)
+              ? this.setDay(row.guaranteePeriod, guaranteePeriodUnitName,row)
               : ''
           );
         }
@@ -1114,8 +1115,9 @@
           ? 'year'
           : 'second';
       },
-      setDay(addDay, dateType = 'day') {
-        return dayjs(this.contractStartDate || new Date())
+      setDay(addDay, dateType = 'day',item) {
+        let tiem= this.contractBookType==1? item.produceDeliveryDeadline:item.customerExpectDeliveryDeadline;
+        return dayjs( tiem|| new Date())
           .add(addDay, dateType)
           .format('YYYY-MM-DD');
       },

src/views/saleManage/saleOrder/invoice/components/detailDialog.vue

@@ -132,19 +132,7 @@
             </div>
             </template> -->
             <template v-slot:technicalDrawings="{ row }">
-              <div
-                v-if="row.technicalDrawings && row.technicalDrawings?.length"
-              >
-                <el-link
-                  v-for="link in row.technicalDrawings"
-                  :key="link.id"
-                  type="primary"
-                  :underline="false"
-                  @click="downloadFile(link)"
-                >
-                  {{ link.name }}
-                </el-link>
-              </div>
+              <fileMain v-model="row.technicalDrawings" type="view"></fileMain>
             </template>
             <template v-slot:packagingStrength="scope">
               <DictSelection
@@ -174,7 +162,7 @@
                   class="time-form"
                 >
                 </ele-pro-table>
-                <el-button type="text" slot="reference">明细</el-button>
+                <!-- <el-button type="text" slot="reference">明细</el-button> -->
               </el-popover>
             </template>
           </ele-pro-table>
@@ -528,11 +516,7 @@
             prop: 'technicalDrawings',
             label: '技术图纸',
             slot: 'technicalDrawings',
-            formatter: (_row, _column, cellValue) => {
-              return (
-                (_row.guaranteePeriod || '') + _row.guaranteePeriodUnitName
-              );
-            },
+
             align: 'center'
           },
           {

src/views/saleManage/saleOrder/returnGoods/components/addReturnGoodsDialog.vue

@@ -795,9 +795,10 @@
           params.sendNoList = [res.sendNo];
           data = await getSendSaleOrderCordList(params);
         }
-
+        console.log(data.productList,'this.productList')
         this.loading = false;
         if (data) {
+
           if (data.contactId) {
             this.contactDetail(data.contactId);
           }