index itemindexitemindex

i18n/locale/zh-CN.js

@@ -1568,6 +1568,7 @@ export default {
     unitPrice: '单价',
     originalManufacturer: '原厂家',
     remark: '备注',
+    materialCode:'物料编码',
   },
   stock_item:{
     creationTime:'创建时间',

pages/material/index.vue

@@ -13,16 +13,13 @@
         <template slot="easySearch">
           <Form ref="formInline" :model="easySearch" inline>
             <FormItem prop="keys">
-              <Input placeholder="请输入物料名称/库位名称" v-model="easySearch.keys.value" v-width="240" />
+              <Input placeholder="请输入物料名称/物料编码/库位名称" v-model="easySearch.keys.value" v-width="260" />
             </FormItem>
             <FormItem>
               <Button type="primary" @click="search">查询</Button>
             </FormItem>
           </Form>
         </template>
-        <template slot="searchForm">
-          <Search />
-        </template>
         <template slot="buttons">
           <Button type="primary" @click="add">入库</Button>
         </template>
@@ -51,7 +48,7 @@ export default {
       action: Api.index,
       showMenu: true,
       easySearch: {
-        keys: { op: "name,storeTitle", value: null }
+        keys: { op: "name,storeTitle,materialCode", value: null }
       },
       fscreeen: false,
       modal: false,
@@ -67,6 +64,13 @@ export default {
           align: "left",
           easy: true,
           high: true
+        },
+         {
+          key: "materialCode",
+          title: this.l("materialCode"),
+          align: "left",
+          easy: true,
+          high: true
         },
         {
           key: "total",

pages/material/itemIndex.vue

 <template>
   <div>
     <span class="mr20">物料名称：{{materialName}}</span>
-    <span class="mr20">物料编号：{{mcode}}</span>
-    <span class="mr20">库位：{{storeTitle}}</span>
+    <span class="mr20">物料编码：{{mcode}}</span>
+    <span>库位：{{storeTitle}}</span>
     <DataGrid
       :columns="columns"
       ref="grid"
@@ -40,7 +40,6 @@ export default {
           easy: true,
           high: true
         },
-
         { key: "total", title: this.l("total"), align: "right", high: true },
         {
           key: "nowTotal",
@@ -80,7 +79,13 @@ export default {
           high: true,
           type: "user"
         },
-        { key: "remark", title: this.l("remark"), align: "left", high: true,tooltip:true }
+        {
+          key: "remark",
+          title: this.l("remark"),
+          align: "left",
+          high: true,
+          tooltip: true
+        }
       ],
       materialName: "",
       storeTitle: ""
@@ -122,7 +127,6 @@ export default {
     search() {
       this.$refs.grid.reload(this.easySearch);
     },
-
     cancel() {
       this.curId = 0;
       this.modal = false;

pages/material/setNum.vue

@@ -13,7 +13,7 @@
       </Col>
       <Col :span="12">
         <FormItem :label="l('minNum')" prop="minNum">
-          <InputNumber v-model="entity.minNum"></InputNumber>
+          <InputNumber v-model="entity.minNum" :min="0"></InputNumber>
         </FormItem>
       </Col>
     </Row>
@@ -53,6 +53,11 @@ export default {
   },
   methods: {
     handleSubmit() {
+      if(this.entity.minNum==0)
+      {
+        this.$Message.error("设置最低库存不能小于1");
+        return
+      }
       let params = {
         id: this.entity.id,
         minNum: this.entity.minNum
@@ -80,6 +85,9 @@ export default {
     load(v) {
       Api.get({ id: v }).then(r => {
         this.entity = r.result;
+        if (!r.result.minNum) {
+          this.entity.minNum = 0;
+        }
       });
     },
     l(key) {