瀏覽代碼

fix: 调拨单

zh 2 年之前
父節點
當前提交
1b30ac3d79
共有 2 個文件被更改,包括 65 次插入52 次删除
  1. 43 37
      src/views/supply/transferOrder/transferOrderForm.vue
  2. 22 15
      src/views/supply/transferOrder/transferOrderList.vue

+ 43 - 37
src/views/supply/transferOrder/transferOrderForm.vue

@@ -186,16 +186,22 @@ export default {
           formItemAttributes: { label: '商家编号', prop: 'transferCustomerNumber' }
         },
         {
-          name: 'el-select',
-          options: this.sonCustomerList,
+          name: 'el-input',
           md: 6,
-          attributes: {
-            clearable: true,
-            filterable: true,
-            disabled: this.comDisabled
-          },
+          attributes: { disabled: this.comDisabled, placeholder: '请输入' },
           formItemAttributes: { label: '商家名称', prop: 'transferCustomerName' }
         },
+        // {
+        //   name: 'el-select',
+        //   options: this.sonCustomerList,
+        //   md: 6,
+        //   attributes: {
+        //     clearable: true,
+        //     filterable: true,
+        //     disabled: this.comDisabled
+        //   },
+        //   formItemAttributes: { label: '商家名称', prop: 'transferCustomerName' }
+        // },
         {
           name: 'el-select',
           md: 6,
@@ -276,14 +282,14 @@ export default {
           },
           render: (h, { column, row, index }) => {
             return (
-              <div style="margin:0 20px">
+              <div style='margin:0 20px'>
                 <el-input
-                  type="number"
+                  type='number'
                   disabled={this.comDisabled}
                   value={row.qty}
                   onInput={e => (row.qty = e)}
-                  placeholder="调拨数量"
-                  size="mini"
+                  placeholder='调拨数量'
+                  size='mini'
                 ></el-input>
               </div>
             )
@@ -297,12 +303,12 @@ export default {
           render: (h, { column, row, index }) => {
             return (
               <el-input
-                type="text"
+                type='text'
                 value={row.notes}
                 disabled={this.comDisabled}
                 onInput={e => (row.notes = e)}
-                placeholder="备注"
-                size="mini"
+                placeholder='备注'
+                size='mini'
               ></el-input>
             )
           }
@@ -323,8 +329,8 @@ export default {
               <div>
                 {!this.comDisabled ? (
                   <el-button
-                    type="text"
-                    size="default"
+                    type='text'
+                    size='default'
                     onClick={() => {
                       this.handleDel(index)
                     }}
@@ -343,29 +349,29 @@ export default {
         ...[
           !this.comDisabled
             ? {
-                name: 'slot-component',
-                md: 24,
-                attributes: { disabled: false },
-                formItemAttributes: { label: '', prop: '' },
-                render: (h, { props, onInput }) => {
-                  return (
-                    <div>
-                      <el-button
-                        size="mini"
-                        onClick={() => {
-                          this.visible = true
-                          this.recordSelected = []
-                        }}
-                      >
+              name: 'slot-component',
+              md: 24,
+              attributes: { disabled: false },
+              formItemAttributes: { label: '', prop: '' },
+              render: (h, { props, onInput }) => {
+                return (
+                  <div>
+                    <el-button
+                      size='mini'
+                      onClick={() => {
+                        this.visible = true
+                        this.recordSelected = []
+                      }}
+                    >
                         添加
-                      </el-button>
-                      <el-button size="mini" onClick={() => this.handleAllDel()}>
+                    </el-button>
+                    <el-button size='mini' onClick={() => this.handleAllDel()}>
                         删除
-                      </el-button>
-                    </div>
-                  )
-                }
+                    </el-button>
+                  </div>
+                )
               }
+            }
             : {}
         ],
         {
@@ -519,7 +525,7 @@ export default {
     }
   },
   mounted() {
-    this.getStagecustomerListV2()
+    // this.getStagecustomerListV2()
     if (this.detailsId) {
       getCustomerTransferDetail({ id: this.detailsId }).then(res => {
         this.formData = res.data

+ 22 - 15
src/views/supply/transferOrder/transferOrderList.vue

@@ -22,27 +22,13 @@ import add_callback_mixin from '@/components/template/add_callback_mixin.js'
 import Popu from '@/components/template/popu.vue'
 import TransferOrderForm from './transferOrderForm.vue'
 import { getListTransferV2, exportListTransferV2 } from '@/api/transferOrder'
+import { mapGetters } from 'vuex'
 export default {
   components: { TemplatePage, Popu, TransferOrderForm },
   mixins: [import_mixin, add_callback_mixin],
   data() {
     return {
       visible: false,
-      // 事件组合
-      optionsEvensGroup: [
-        [
-          [
-            {
-              name: '新增',
-              click: this.addOn(() => {
-                this.visible = true
-                this.moduleType = 1
-              })
-              // isRole: this.$checkBtnRole('add', this.$route.meta.roles)
-            }
-          ]
-        ]
-      ],
       // 表格属性
       tableAttributes: {
         // 启用勾选列
@@ -60,9 +46,30 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(['isCustomer']),
     content() {
       const titleArr = ['新增', '详情', '审核', '编辑']
       return titleArr[this.moduleType - 1]
+    },
+    // 事件组合
+    optionsEvensGroup() {
+      return [
+        ...[
+          this.isCustomer ? [
+            [
+              {
+                name: '新增',
+                click: this.addOn(() => {
+                  this.visible = true
+                  this.moduleType = 1
+                })
+              // isRole: this.$checkBtnRole('add', this.$route.meta.roles)
+              }
+            ]
+          ] : []
+        ]
+
+      ]
     }
   },
   methods: {