Merge branch 'master' of https://code.palacesun.com/wuchao/jilinzhongdianrenqun-web

src/view/key-person/key_dm_conf/index.vue

@@ -1041,7 +1041,7 @@ export default {
         } else {
           this.$Notice.error({ title: '保存失败', desc: ret.data && ret.data.errmsg })
         }
-      }).finally(() => { })
+      }).finally(() => {})
     }
   }
 }

src/view/key-person/key_dm_conf/materialSelector.vue

@@ -2,23 +2,19 @@
   <Modal v-model="visible" title="选择物料" width="900" :mask-closable="false">
     <div class="search-div">
       <Row type="flex" :gutter="16" align="middle">
-        <Col :span="6">
+        <Col :span="18">
           <span>分类：</span>
-          <Select v-model="filters.category_id" clearable style="width: 100%">
-            <Option v-for="c in categoryOptions" :key="c.id" :value="c.id">{{ c.category_Name }}</Option>
+          <Select v-model="filters.category_id" clearable style="width: 130px" class="mr10">
+            <Option v-for="c in categoryOptions" :key="c.id" :value="c.id">{{ c.category_name }}</Option>
           </Select>
-        </Col>
-        <Col :span="6">
           <span>物料编码：</span>
-          <Input v-model="filters.material_code" placeholder="物料编码" />
-        </Col>
-        <Col :span="8">
+          <Input v-model="filters.material_code" placeholder="物料编码" style="width: 150px" class="mr10" />
           <span>物料名称：</span>
-          <Input v-model="filters.material_name" placeholder="物料名称" />
+          <Input v-model="filters.material_name" placeholder="物料名称" style="width: 150px" />
         </Col>
-        <Col :span="4" class="text-right">
+        <Col :span="6" class="text-right">
           <Button type="primary" class="mr10" @click="handleSearch">搜索</Button>
-          <Button @click="handleReset">重置</Button>
+          <Button type="primary" @click="handleReset">重置</Button>
         </Col>
       </Row>
     </div>
@@ -58,11 +54,11 @@ export default {
       categoryOptions: [],
       columns: [
         { type: 'selection', width: 60 },
-        { title: '物料编码', key: 'material_code', align: 'center' },
-        { title: '物料名称', key: 'material_name', align: 'center' },
-        { title: '单位', key: 'unit', align: 'center', width: 80 },
-        { title: '可用库存', key: 'available_quantity', align: 'center', width: 120 },
-        { title: '分类', key: 'category_Name', align: 'center' }
+        { title: '分类', key: 'category_name', align: 'center', minWidth: 80 },
+        { title: '物料编码', key: 'material_code', align: 'center', minWidth: 100 },
+        { title: '物料名称', key: 'material_name', align: 'center', minWidth: 100 },
+        { title: '单位', key: 'unit', align: 'center', minWidth: 80 },
+        { title: '可用库存', key: 'available_quantity', align: 'center', minWidth: 120 }
       ]
     }
   },
@@ -95,7 +91,7 @@ export default {
     },
     fetchList () {
       this.loading = true
-      const payload = { pageNo: this.pager.pageNo, pageSize: this.pager.pageSize, params: this.filters }
+      const payload = Object.assign({ pageNo: this.pager.pageNo, pageSize: this.pager.pageSize }, this.filters)
       getMaterialList(payload).then(ret => {
         if (ret.data && ret.data.errcode === 0) {
           const data = ret.data.data || {}
@@ -146,4 +142,5 @@ export default {
 .search-div { border: 1px solid #dce1e7; padding: 12px; margin-bottom: 12px; background-color: #f8fbff; }
 .mr10 { margin-right: 10px; }
 .page_style { margin-top: 12px; text-align: right; }
+.text-right { text-align: right; }
 </style>