Merge branch 'purchaseDev' into 'dev'

Purchase dev

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

src/assets/styles/ruoyi.scss

@@ -178,7 +178,8 @@
 }
 
 .el-card__header {
-	padding: 14px 15px 7px;
+	// padding: 14px 15px 7px;
+	padding: 0px 15px 0px;
 	min-height: 40px;
 }
 

src/components/super-form/index.vue

@@ -169,7 +169,7 @@ export default {
 </template>
 
 <style scoped>
-.superForm>>>.el-form-item{
-  margin-bottom: 12px;
+.superForm >>> .el-form-item {
+  margin-bottom: 5px;
 }
 </style>

src/components/super-search/index.vue

@@ -117,7 +117,7 @@ export default {
               v-if="attr.is === 'el-select'"
               v-bind="attr"
               v-model="innerValue[item.key]"
-              @change="attr.multiple ? '': $emit('submit')"
+              @change="attr.multiple ? '' : $emit('submit')"
               style="width: 100%"
             >
               <template>
@@ -212,7 +212,7 @@ export default {
 </template>
 
 <style scoped>
-.superForm>>>.el-form-item{
+.superForm >>> .el-form-item {
   margin-bottom: 12px;
 }
 </style>

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

@@ -82,10 +82,6 @@ export default function useColumns() {
       attr: { is: "el-input", disabled: true, readonly: true },
     },
     {
-      item: { key: "file", title: "附件", span: 24 },
-      attr: { is: "el-file-upload" },
-    },
-    {
       item: { key: "sourceType", title: "来源单据类型" },
       attr: { is: "el-input", disabled: true, readonly: true },
     },
@@ -99,6 +95,10 @@ export default function useColumns() {
         value: "0",
       },
     },
+    {
+      item: { key: "file", title: "附件", span: 24 },
+      attr: { is: "el-file-upload" },
+    },
   ].map(({ item, attr }) => ({
     attr,
     item: { ...item, hidden: true, span: item.span || 6 },

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

@@ -78,14 +78,6 @@ export default function useColumns() {
       },
     },
     {
-      item: { key: "approveTime", title: "单据申请日期" },
-      attr: { is: "el-input", disabled: true, readonly: true },
-    },
-    {
-      item: { key: "file", title: "附件", span: 24 },
-      attr: { is: "el-file-upload" },
-    },
-    {
       item: { key: "sourceType", title: "来源单据类型" },
       attr: { is: "el-input", disabled: true, readonly: true },
     },
@@ -99,6 +91,14 @@ export default function useColumns() {
         value: "0",
       },
     },
+    {
+      item: { key: "approveTime", title: "单据申请日期" },
+      attr: { is: "el-input", disabled: true, readonly: true },
+    },
+    {
+      item: { key: "file", title: "附件", span: 24 },
+      attr: { is: "el-file-upload" },
+    },
   ].map(({ item, attr }) => ({
     attr,
     item: { ...item, hidden: true, span: item.span || 6 },

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

@@ -82,10 +82,6 @@ export default function useColumns() {
       attr: { is: "el-input", disabled: true, readonly: true },
     },
     {
-      item: { key: "file", title: "附件", span: 24 },
-      attr: { is: "el-file-upload" },
-    },
-    {
       item: { key: "sourceType", title: "来源单据类型" },
       attr: { is: "el-select", dictName: "price_source", disabled: true, readonly: true },
     },
@@ -99,6 +95,10 @@ export default function useColumns() {
         value: "0",
       },
     },
+    {
+      item: { key: "file", title: "附件", span: 24 },
+      attr: { is: "el-file-upload" },
+    },
   ].map(({ item, attr }) => ({
     attr,
     item: { ...item, hidden: true, span: item.span || 6 },

src/views/purchase/purchase-order/add/column.js

@@ -359,6 +359,8 @@ const PurColumns =[
    {
     key: "remark",
     title: "备注",
+    // span: 12,
+    rows: 1,
     inputType: "Textarea",
     isShow:true,
    },
@@ -1124,6 +1126,7 @@ const CauseColumns =[
   {
     key: "remark",
     title: "备注",
+    rows: 1,
     inputType: "Textarea",
     isShow:true,
    },

src/views/purchase/purchase-order/add/index.vue

@@ -809,7 +809,7 @@ export default {
     >
       <el-card
         :body-style="{
-          padding: '20px',
+          padding: '20px 20px 10px',
           display: 'flex',
           'flex-wrap': 'wrap',
         }"
@@ -870,6 +870,7 @@ export default {
                 v-if="column.inputType === 'Textarea'"
                 v-model="params[column.key]"
                 type="textarea"
+                :rows="column.rows"
                 :placeholder="column.placeholder"
                 :clearable="column.clearable"
                 :disabled="column.disabled"
@@ -1119,7 +1120,7 @@ export default {
 
 <style scoped>
 .orderAddForm >>> .el-form-item {
-  margin-bottom: 12px;
+  margin-bottom: 5px;
 }
 ::v-deep .singleTable .el-form-item {
   margin-bottom: 0px;

src/views/purchase/purchase-order/column.js

@@ -83,51 +83,68 @@ const PurColumns = [
     },
   },
   { 
-    item:{ key: "warehouseName", title: "WMS入库仓库" ,},
+    item:{
+      key: "erpOrderCode", 
+      title: "erp订单编号",
+    },
     attr:{
       isHidden:true,
     },
-    width:100,
-  }, //WMS入库仓库名称
+    width:150,
+  },
   { 
     item:{
-      key: "rebateMoney", 
-      title: "订单使用返利金额" ,
+      key: "deliveryStatus",
+      title: "erp发送状态", 
       width:100,
-      // 
     },
     attr:{
-      isHidden:true,
-      isSummary:true,
+      clearable:true,
+      is: "el-dict-tag",
+      dictName: "order_delivery_status",
     },
   },
-  { 
-    item:{key: "deductionMoney", title: "订单抵扣余款金额" ,},
+  {
+    item:{
+      key: "source",
+      title: "订单来源",  
+      width:80,
+    },
     attr:{
+      is: "el-dict-tag",
+      dictName: "order_source",
       isHidden:true,
-      isSummary:true,
-     
     },
-    width:100,
   },
   { 
-    item:{ key: "approveUser", title: "当前审批人" ,},
+    item:{ key: "warehouseName", title: "WMS入库仓库" ,},
     attr:{
       isHidden:true,
     },
-  },
+    width:100,
+  }, //WMS入库仓库名称
   { 
-    item:{ key: "redeployName", title: "转派人" , width:100 ,},
+    item:{
+      key: "rebateMoney", 
+      title: "订单使用返利金额" ,
+      width:100,
+      // 
+    },
     attr:{
       isHidden:true,
+      isSummary:true,
     },
   },
   { 
-    item:{ key: "redeployDate", title: "转派时间" ,},
+    item:{key: "deductionMoney", title: "订单抵扣余款金额" ,},
     attr:{
       isHidden:true,
+      isSummary:true,
+     
     },
+    width:100,
   },
+  
   { 
     item:{ key: "remark", title: "备注" ,},
     attr:{
@@ -162,6 +179,26 @@ const PurColumns = [
     },
     width:100,
   },
+  {
+    item:{ 
+      key: "closePay",
+      title: "付款关闭",
+      width:80,
+    },
+    attr:{
+      is: "el-checkbox",
+      'true-label':"Y",
+      'false-label':"N",
+      disabled:true,
+      isHidden:true,
+    },
+  },
+  { 
+    item:{ key: "fileNumber", title: "附件数量" ,width:100,},
+    attr:{
+      isHidden:true,
+    },
+  },
   { 
     item:{ key: "invoiceMoney", title: "发票金额" ,},
     attr:{
@@ -216,6 +253,24 @@ const PurColumns = [
       isSummary:true,
     },
   },
+  { 
+    item:{ key: "approveUser", title: "当前审批人" ,},
+    attr:{
+      isHidden:true,
+    },
+  },
+  { 
+    item:{ key: "redeployName", title: "转派人" , width:100 ,},
+    attr:{
+      isHidden:true,
+    },
+  },
+  { 
+    item:{ key: "redeployDate", title: "转派时间" ,},
+    attr:{
+      isHidden:true,
+    },
+  },
 ].map(({ item, attr }) => ({
   attr,
   item: { ...item, hidden: true, fixed: false },
@@ -700,26 +755,27 @@ const CauseColumns = [
       isHidden:true,
     },
   },
+  
   { 
-    item:{ key: "approveUser", title: "当前审批人" ,},
+    item:{ key: "remark", title: "备注" ,},
     attr:{
       isHidden:true,
     },
   },
   { 
-    item:{ key: "redeployName", title: "转派人" , width: 100,},
+    item:{ key: "approveUser", title: "当前审批人" ,},
     attr:{
       isHidden:true,
     },
   },
   { 
-    item:{ key: "redeployDate", title: "转派时间" ,},
+    item:{ key: "redeployName", title: "转派人" , width: 100,},
     attr:{
       isHidden:true,
     },
   },
   { 
-    item:{ key: "remark", title: "备注" ,},
+    item:{ key: "redeployDate", title: "转派时间" ,},
     attr:{
       isHidden:true,
     },

src/views/purchase/purchase-order/edit/index.vue

@@ -837,6 +837,7 @@ export default {
                 v-if="column.inputType === 'Textarea'"
                 v-model="params[column.key]"
                 type="textarea"
+                :rows="column.rows"
                 :placeholder="column.placeholder"
                 :clearable="column.clearable"
                 :disabled="column.disabled"
@@ -1121,7 +1122,7 @@ export default {
 
 <style scoped>
 .orderEditForm >>> .el-form-item {
-  margin-bottom: 12px;
+  margin-bottom: 5px;
 }
 ::v-deep .singleTable .el-form-item {
   margin-bottom: 0px;

src/views/purchase/purchase-order/index.vue

@@ -723,7 +723,6 @@ export default {
 
         <el-button-group style="margin-left: 10px">
           <el-button
-          
             :size="size"
             :disabled="checkedList.length != 1"
             @click="handleCopy"
@@ -739,7 +738,6 @@ export default {
           :key="checkedList.length + 1"
         >
           <el-button
-          
             :size="size"
             @click="handleAllReturn"
             :disabled="judgeIsAllReturn()"
@@ -757,9 +755,7 @@ export default {
           <el-button size="mini" @click="handlePaymentRequest"
             >付款申请</el-button
           >
-          <el-button size="mini" @click="handleDownload"
-            >批量导出</el-button
-          >
+          <el-button size="mini" @click="handleDownload">批量导出</el-button>
         </el-button-group>
         <el-button-group>
           <zp-button
@@ -897,4 +893,6 @@ export default {
   </el-card>
 </template>
 
-<style lang="scss"></style>
+<style lang="scss">
+
+</style>

src/views/purchase/purchase-order/see/index.vue

@@ -293,6 +293,7 @@ export default {
                 v-if="column.inputType === 'Textarea'"
                 v-model="params[column.key]"
                 type="textarea"
+                :rows="column.rows"
                 :placeholder="column.placeholder"
                 :clearable="column.clearable"
                 readonly
@@ -523,7 +524,7 @@ export default {
 
 <style scoped>
 .orderSeeForm >>> .el-form-item {
-  margin-bottom: 12px;
+  margin-bottom: 5px;
 }
 ::v-deep .singleTable .el-form-item {
   margin-bottom: 0px;