1

src/views/work/confirmPriceModal.vue

@@ -220,7 +220,7 @@
           }
           let price = ele.discount == 1 ? ele.priceDiscount : ele.price;
           valueObj[`priceList${ele.priceListId}`] = ele.count || 0;
-          valueObj[`remark${ele.priceListId}`] = ele.remark || 0;
+          valueObj[`remark${ele.priceListId}`] = ele.remark || '';
           valueObj[`priceListText${ele.priceListId}`] = `${ele.name} ${price} 元${
             ele.type == 0 ? '/' + ele.partUnit : ''
           }`;

src/views/work/query.vue

@@ -509,7 +509,7 @@
         api: queryList,
         columns: columns,
         useSearchForm: true,
-        searchInfo: { status: tableType },
+        // searchInfo: { status: tableType },
         formConfig: searchForm,
         showTableSetting: true,
         showIndexColumn: false,

src/views/work/quoteModel.vue

@@ -372,7 +372,7 @@
               labelField: 'name',
               valueField: 'laborCostId',
               showSearch: true,
-              placeholder: '请输入明细名称',
+              placeholder: `请输入${isJm ? '减免' : '明细'}名称`,
               onChange: (value) => {
                 console.log('onchange', value, arguments);
               },
@@ -437,6 +437,9 @@
       }
       const handleSubmit = async () => {
         const params = await validate();
+        if(fileFlow.priceCount<0){
+          return createMessage.error('合计金额不能小于0');
+        }
         try {
           createConfirm({
             iconType: 'warning',