出入库

app/admin/controller/shop/CustomerSpec.php

@@ -31,6 +31,7 @@ class CustomerSpec extends Backend
         $this->model = new CustomerSpecModel();
         $this->assign('customerList', Customer::where('status', 1)->column('name','id'));
         $this->assign('fieldList', StockConfig::where('type_id', 'variety_name')->order('sort desc')->column('title','id'));
+         $this->relationField=['customer'];
     }
 
     //查看

app/admin/view/shop/customer_spec/index.html

@@ -35,9 +35,23 @@ export default{
                 return true;
             }},
             {field:"id",title:"主键",operate:false},
-            {field:"customer_id",title:"客户ID"},
-            {field:"variety",title:"品种",operate:false},
-            {field:"specs",title:"品种规格",operate:false},
+            {field:"customer.name",title:"客户ID"},
+            {field:"variety",title:"品种",width: 200, operate: false,formatter:function (data) {
+                data = JSON.parse(data);
+                let res = "";
+                for (var key in Object(data)) {
+                   res += data[key]['label'] +'-'
+                }
+                return res.replace(/-+$/, '')
+            }},
+            {field:"specs",title:"品种规格",width: 200, operate: false,formatter:function (data) {
+                data = JSON.parse(data);
+                let res = "";
+                for (var key in Object(data)) {
+                   res += data[key]['name'] +'-'
+                }
+                return res.replace(/-+$/, '')
+            }},
             {field:"create_time",title:"创建时间",operate:"daterange",formatter:Yunqi.formatter.datetime},
             {field:"update_time",title:"修改时间",operate: false,formatter:Yunqi.formatter.datetime},
             {

app/admin/view/shop/shop_delivery/index.html

@@ -38,12 +38,12 @@
                 {field: 'status', title: __('状态'),width:120,searchList: {1: __('待结算'),2: __('已结算'), 3: __('驳回')},formatter:Yunqi.formatter.switch},
                 {field: 'settlement_data', title: __('结算时间'), width:160,formatter: Yunqi.formatter.datetime,operate:false,sortable: true},
                 {field: 'createtime', title: __('创建时间'), width:160,formatter: Yunqi.formatter.datetime,operate:false,sortable: true},
-                {
-                    field: 'operate',
-                    title: __('操作'),
-                    width:150,
-                    action:{sort:true,edit:true,del:true}
-                }
+                // {
+                //     field: 'operate',
+                //     title: __('操作'),
+                //     width:150,
+                //     action:{sort:true,edit:true,del:true}
+                // }
             ]
         },
         methods: {

app/admin/view/user/stock_log/add.html

@@ -24,10 +24,8 @@ export default{
     data:{
         columns:[
             {field:"id",title:"ID",edit:"hidden"},
-            {field:"user_id",title:"user_id",edit:"number"},
-            {field:"type_id",title:"类型",edit:"text",rules:"required"},
-            {field:"type",title:"类型1是出库  2是入库",edit:"select",rules:"required",searchList:{1:"是",0:"否"}},
-            {field:"variety_id",title:"品种id",edit:"number"},
+    
+   
             {field:"change",title:"变更数量",edit:"text",rules:"required"},
             {field:"after",title:"当前库存",edit:"text",rules:"required"},
             {field:"remark",title:"备注",edit:"text",rules:"required"},

app/admin/view/user/stock_log/index.html

@@ -4,10 +4,9 @@
                 :columns="columns"
                 ref="yuntable"
                 @render="onTableRender"
-                toolbar="refresh,add,edit"
+                toolbar="refresh"
                 :auth="{
-                    add:{:$auth->check('app\\admin\\controller\\user\\StockLog','add')},
-                    edit:{:$auth->check('app\\admin\\controller\\user\\StockLog','edit')},
+            
                     multi:{:$auth->check('app\\admin\\controller\\user\\StockLog','multi')},
                 }"
                 :extend="extend">
@@ -23,8 +22,7 @@ export default{
     data:{
         extend:{
             index_url: 'user/stock_log/index',
-            add_url: 'user/stock_log/add',
-            edit_url: 'user/stock_log/edit',
+     
             multi_url: 'user/stock_log/multi',
         },
         columns:[
@@ -51,17 +49,7 @@ export default{
             {field:"remark",title:"备注",operate:false},
             {field:"createtime",title:"创建时间",operate:"daterange",formatter:Yunqi.formatter.datetime},
             {field:"updatetime",title:"变更时间",visible:false,operate:false,formatter:Yunqi.formatter.datetime},
-            {
-                field: 'operate',
-                title: __('操作'),
-                width:130,
-                action:{
-                    edit:function(row){
-                        //可以根据业务需求返回false让按钮不显示
-                        return true
-                    },
-                }
-            }
+        
         ]
     },
     //页面加载完成时执行

app/api/service/StockService.php

@@ -20,7 +20,7 @@ class StockService {
             foreach ($data['variety'] as $item) 
             {
                   if(count($item) != 4 || empty(floatval($item['num'])))  throw new \Exception('参数有误！');
-                  $weight = ($data['type']== '2') ? -$item['num']: $item['num'];
+                  $weight = ($data['type']== '1') ? -$item['num']: $item['num'];
                 
                   //根据品种扣除库存
                   $stock = StockDetail::setStockConfigNum((int)$item['variety_id'], (string)$weight, $data['type_id']);

app/common/model/CustomerSpec.php

@@ -8,4 +8,10 @@ use think\Model;
 class CustomerSpec Extends Model
 {
 
+
+      //customer
+      public function customer()
+      {
+            return $this->hasOne(Customer::class,'id','customer_id');
+      }
 }