Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!572

src/views/material/classify/index.vue

@@ -3,7 +3,7 @@
 
     <el-card v-loading="loading">
 
-      <el-row :gutter="10" class="mb10">
+      <el-row :gutter="10" class="mb10" style="position: fixed;top: 20px; right: 50px;z-index: 999;">
         <div>
           <el-button type="primary" size="mini" @click="mbDownload">模板下载</el-button>
           <el-button type="primary" size="mini" @click="importMb">导入</el-button>
@@ -40,7 +40,7 @@
           </el-tree>
         </el-col>
 
-        <el-col :span="18">
+        <el-col :span="16" style="position: fixed;top: 40px; right: 40px;z-index: 999;">
           <span class="title">基本信息</span>
           <el-form
             :model="ruleForm"

src/views/purchase/apply/add/columns.js

@@ -168,16 +168,16 @@ export default function useColumns() {
         //     },
         //   },
         // },
-        {
-          item: { key: "conversionRate", title: "采购换算率", required: true },
-          attr: {
-            is: "el-input-number",
-            min: 0,
-            precision: CONFIG.precision,
-            value: 1,
-            disabled: true,
-          },
-        },
+        // {
+        //   item: { key: "conversionRate", title: "采购换算率", required: true },
+        //   attr: {
+        //     is: "el-input-number",
+        //     min: 0,
+        //     precision: CONFIG.precision,
+        //     value: 1,
+        //     disabled: true,
+        //   },
+        // },
         {
           item: { key: "customerName", title: "客户" },
           attr: {

src/views/purchase/apply/copy/columns.js

@@ -168,16 +168,16 @@ export default function useColumns() {
         //     },
         //   },
         // },
-        {
-          item: { key: "conversionRate", title: "采购换算率", required: true },
-          attr: {
-            is: "el-input-number",
-            min: 0,
-            precision: CONFIG.precision,
-            value: 1,
-            disabled: true,
-          },
-        },
+        // {
+        //   item: { key: "conversionRate", title: "采购换算率", required: true },
+        //   attr: {
+        //     is: "el-input-number",
+        //     min: 0,
+        //     precision: CONFIG.precision,
+        //     value: 1,
+        //     disabled: true,
+        //   },
+        // },
         {
           item: { key: "customerName", title: "客户" },
           attr: {

src/views/purchase/apply/edit/columns.js

@@ -168,16 +168,16 @@ export default function useColumns() {
         //     },
         //   },
         // },
-        {
-          item: { key: "conversionRate", title: "采购换算率", required: true },
-          attr: {
-            is: "el-input-number",
-            min: 0,
-            precision: CONFIG.precision,
-            value: 1,
-            disabled: true,
-          },
-        },
+        // {
+        //   item: { key: "conversionRate", title: "采购换算率", required: true },
+        //   attr: {
+        //     is: "el-input-number",
+        //     min: 0,
+        //     precision: CONFIG.precision,
+        //     value: 1,
+        //     disabled: true,
+        //   },
+        // },
         {
           item: { key: "customerName", title: "客户" },
           attr: {

src/views/purchase/apply/see/columns.js

@@ -98,15 +98,15 @@ export default function useColumns() {
         //   item: { width: 100, key: "puUnitName", title: "采购单位" },
         //   attr: {},
         // },
-        {
-          item: { width: 100, key: "conversionRate", title: "采购换算率" },
-          attr: {
-            is: "el-computed-input-v2",
-            formatter: (prop) => {
-              return prop == null ? 0 : (prop * 1);
-            },
-          },
-        },
+        // {
+        //   item: { width: 100, key: "conversionRate", title: "采购换算率" },
+        //   attr: {
+        //     is: "el-computed-input-v2",
+        //     formatter: (prop) => {
+        //       return prop == null ? 0 : (prop * 1);
+        //     },
+        //   },
+        // },
         {
           item: { width: 100, key: "customerName", title: "客户" },
           attr: {},