Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0

src/api/Inventory/MaterialOut.js

@@ -42,7 +42,7 @@ export function searchList(pageCurrent, pageSize, listNumber_check, listNumber)
     data: {
       type: '1',
       name: '车间装配管理_领料单_查询数据',
-      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber,
+      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber + '&是否审批=1',
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/PurchasingCenter/CreatePurchaseContract.js

@@ -72,6 +72,17 @@ export function savePrice(price, num1, num2, num3, num4, num5) {
     }
   })
 }
+// 实时保存备注
+export function saveRemark(price, num1, num2, num3, num4, num5) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '4',
+      name: `update 采购管理_询价单明细_视图 set 备注 = '${price}' where isnull(物料流水号,0) = isnull('${num1}',0) and 询价单流水号 = ${num2} and isnull(零件名称,'') = '${num3}' and isnull(零件图号,'') = '${num4}' and (isnull(规格,'') = '${num5}' or isnull(物料规格,'') = '${num5}')`
+    }
+  })
+}
 // 实时保存合同头
 export function saveContractHeader(...params) {
   return request({