update

src/views/purchase/catalogue/column.js

@@ -32,10 +32,11 @@ export const FormColumns = [
     disabled: true,
     readonly: true,
   },
+  { key: "materialName", title: "物料名称" },
   { key: "material", title: "物料编码" },
   { key: "materialClassify", title: "物料一级分类" },
+  { key: "manufacturerName", title: "生产厂家名称" },
   { key: "manufacturer", title: "生产厂家" },
-  { key: "materialName", title: "物料名称" },
   { key: "model", title: "物料型号" },
   { key: "specification", title: "物料规格" },
   { key: "supplier", title: "供应商" },
@@ -112,7 +113,7 @@ export const SearchColumns = [
     inputType: "PopoverSelect",
     width: 200,
     referName: "MATERIAL_PARAM",
-    valueKey: "code",
+    valueKey: "id",
   },
   {
     key: "status",

src/views/purchase/contract/add/column.js

@@ -76,7 +76,7 @@ export const FormColumns = [
   {
     key: "grossRateAverage",
     title: "平均毛利率",
-    inputType: "Input",
+    inputType: "InputNumber",
     require: true,
   },
   {
@@ -103,7 +103,7 @@ export const FormColumns = [
   {
     key: "brandGrossRate",
     title: "同类品牌及毛利率",
-    inputType: "Input",
+    inputType: "InputNumber",
     require: true,
   },
   {

src/views/purchase/task/column.js

@@ -40,6 +40,7 @@ export const TableColumns = [
   { key: "source", title: "需求来源" },
   // { key: "customer", title: "收货客户" },
   { key: "customerName", title: "收货客户" },
+  { key: "assignSupplierName", title: "指定供应商" },
   // { key: "puUnit", title: "采购单位" },
 
   { key: "demandDate", title: "需求时间" },
@@ -62,7 +63,6 @@ export const TableColumns = [
   { key: "baskCause", title: "退回原因" },
   { key: "backDate", title: "退回日期" },
   // { key: "assignSupplier", title: "指定供应商" },
-  { key: "assignSupplierName", title: "指定供应商" },
   // { key: "unit", title: "单位" },
   { key: "unitName", title: "单位" },
   // { key: "file", title: "附件" },

src/views/purchase/task/first-direct/column.js

@@ -20,7 +20,7 @@ export const TableColumns = [
   { key: "effectiveDate", title: "价格生效日期" },
   { key: "endDate", title: "价格失效日期" },
   {
-    key: "tax",
+    key: "newTax",
     title: "税率",
     inputType: "ComputedInput",
     width: 200,

src/views/purchase/task/index.vue

@@ -122,7 +122,13 @@ export default {
       await open(prop);
     },
     hasPowerDirect(prop) {
-      return !!prop.length;
+      if (prop.length === 1) {
+        const [{ status }] = prop;
+        if (status === "1") return false;
+        else return true;
+      } else {
+        return !!prop.length;
+      }
     },
     // 导 出
     async useExport(prop, page) {