Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

src/views/purchasingManage/purchaseOrder/index.vue

@@ -200,7 +200,7 @@
           <return-goods @getToDoReminder="getToDoReminder"></return-goods>
         </div>
         <div v-if="activeComp == 'exceptionList'">
-          <exceptionList :relationType="2" @getToDoReminder="getToDoReminder">
+          <exceptionList :relationType="'2'" @getToDoReminder="getToDoReminder">
           </exceptionList>
         </div>
         <div v-if="activeComp == 'accountstatement'">

src/views/saleManage/saleOrder/entrustedReceive/components/addOrEditDialog.vue

@@ -278,6 +278,9 @@
                   item.productId = item.categoryId;
                   item.productName = item.categoryName;
                   item.bomCode = item.bomCode;
+                  item.discountSinglePrice = 0;
+                  item.singlePrice = 0;
+
                   return item;
                 });
                 mbomCategoryList.push(...arr);

src/views/saleManage/saleOrder/entrustedReceive/components/inventoryTable.vue

@@ -112,7 +112,7 @@
         <el-form-item
           style="margin-bottom: 20px"
           :prop="'datasource.' + scope.$index + '.singlePrice'"
-          :rules="[{ required: true, message: '请输入单价', trigger: 'blur' }]"
+         
         >
           <el-input
             v-model="scope.row.singlePrice"
@@ -450,7 +450,6 @@
             width: 150,
             prop: 'singlePrice',
             label: '单价',
-            headerSlot: 'headerTotalCount',
             slot: 'singlePrice',
             align: 'center'
           },
@@ -647,7 +646,7 @@
           'totalPrice',
           this.getTotalPrice(row).toFixed(2)
         );
-        this.$set(this.form.datasource[index], 'discountSinglePrice', val);
+        this.$set(this.form.datasource[index], 'discountSinglePrice', row.singlePrice);
         this.$set(
           this.form.datasource[index],
           'discountTotalPrice',

src/views/saleManage/saleOrder/exceptionManagement/exceptionList/index.vue

@@ -160,7 +160,7 @@
     mixins: [dictMixins, tabMixins],
     props: {
       relationType: {
-        default: 1
+        default: '1,3'
       }
     },
     data() {
@@ -348,8 +348,7 @@
       reload(where) {
         this.$nextTick(() => {
           this.$refs.table.reload({ page: 1, where });
-        this.$emit('getToDoReminder')
-
+          this.$emit('getToDoReminder');
         });
       }
     }