up

src/views/inventorys/index.vue

@@ -4,7 +4,11 @@
     <div ref="lxHeader">
       <lx-header icon="md-apps" text="库存管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
         <slot>
-          <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
+          <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
+            <div class="selector-item">
+              <span class="selector-item__label">物资编码：</span>
+              <Input v-model="select.wzbm" style="width: 120px;margin-right: 10px;" placeholder="物资编码搜索" />
+            </div>
             <div class="selector-item">
               <span class="selector-item__label">资产名称：</span>
               <Input v-model="select.keyword" style="width: 120px;margin-right: 10px;" placeholder="资产名称搜索" />
@@ -100,7 +104,8 @@
         select: {
           pageSize: 10,
           pageIndex: 1,
-          keyword: "",
+          keyword: "",
+          wzbm:'',
           is_export: 0,
           min: '',
           max: '',
@@ -377,6 +382,10 @@
           table_name: 'inventorys',
           // is_export:this.select.is_export,
           filter: [{
+              "key": "wuzibianma",
+              "op": "like",
+              "value": this.select.wzbm,
+            },{
               "key": "zichanmingcheng",
               "op": "like",
               "value": this.select.keyword,

src/views/outbounds/index.vue

@@ -26,16 +26,17 @@
           <template slot-scope="scope">
             <template v-if="isCkName=='仓库管理员'||roleName=='系统管理员'">
               <Button v-if='scope.row.zhuangtai==="已办结"' type="primary" size="small" style="margin-left: 10px;" @click="editorChuku(scope.row.id,'outbounds')">出库</Button>
-              <Button type="primary" size="small" style="margin-left: 10px;" @click="printChuku(scope.row.id,'print')">打印</Button>
             </template>
-           <template v-if="scope.row.jilurenyuan==authName||roleName=='系统管理员'">
+            <template v-if="scope.row.jilurenyuan==authName||isCkName=='仓库管理员'||roleName=='系统管理员'">
+              <Button type="primary" size="small" style="margin-left: 10px;" @click="printChuku(scope.row.id,'print')">打印</Button>
+           <!-- <template v-if="scope.row.jilurenyuan==authName||roleName=='系统管理员'"> -->
               <Button type="primary" size="small" style="margin-left: 10px;" @click="editorChuku(scope.row.id,'editor')">编辑</Button>
               <Button v-if='scope.row.zhuangtai==="待处理"' type="primary" size="small" style="margin-left: 10px;" @click="tofollow(scope.row.id,scope.row)">请示流程</Button>
               <Poptip transfer confirm title="确认要删除吗？" @on-ok="deleteChuku(scope.row)">
                 <Button type="primary" style="margin-left: 10px;" size="small" ghost>删除</Button>
               </Poptip>
+            <!-- </template> -->
             </template>
-
           </template>
         </el-table-column>
       </template>
@@ -152,6 +153,37 @@
             width: 180,
             prop: 'jilurenyuan',
             align:'center'
+          },
+          {
+            label: "出库详情",
+            width: 300,
+            prop: 'id_outbounds_items_outbounds_id_relation',
+            align:'left',
+            customFn: (row) => {
+              if(row.id_outbounds_items_outbounds_id_relation.length>0){
+                return row.id_outbounds_items_outbounds_id_relation.map(item => {
+                    return ( <p> {item.wuzibianma}-{item.zichanmingcheng}
+                   ：{item.guigexinghao?'('+item.guigexinghao+')':''}
+                      {item.jieyongshuliang}{item.jiliangdanwei}
+                       </p>)
+                })
+              }else{
+                return
+              }
+
+            }
+            // formatter(cell, data, value, index){
+            //   console.log("value",value)
+            //   if(value.length>0){
+            //     let html = ''
+            //     for(var item of value){
+            //       html+= `${item.wuzibianma}-${item.zichanmingcheng}${item.guigexinghao?'('+item.guigexinghao+')':''}-${item.jieyongshuliang}${item.jiliangdanwei}`
+            //     }
+            //     return html
+            //   }else{
+            //     return ''
+            //   }
+            // }
           },
           {
             label: "备注",