Merge branch 'master' of http://39.104.94.153:3000/yf_zd/second

apps/AppInfo/admin.py

@@ -601,7 +601,7 @@ class PersonPickAdmin(admin.ModelAdmin):
 @admin.register(Store_Manage)
 class StoreManageAdmin(admin.ModelAdmin):
     # 列表页面显示字段
-    list_display = ['name','rtype','spec','rese','farm','upl_time']
+    list_display = ['name','rtype','spec','rese','graden','upl_time']
     # 搜索项：
     search_fields = ['name']
 

apps/AppInfo/models.py

@@ -522,7 +522,7 @@ class Store_Manage(models.Model):
     rtype = models.CharField(u'物料类别', max_length=20, blank=True, null=True)
     spec = models.CharField(u'规格', max_length=20, blank=True, null=True)
     rese = models.CharField(u'库存', max_length=20, blank=True, null=True)
-    farm = models.ForeignKey(FarmList,blank=True, null=True,verbose_name=u'所属农场')
+    graden = models.ForeignKey(GardenArea,blank=True, null=True,verbose_name=u'所属农场')
     upl_time = models.DateTimeField(u'创建时间', blank=True, null=True)
 
     class Meta:

apps/Equipment/views.py

@@ -1401,6 +1401,23 @@ class Sightsee_Pub(ListView):
         # 简介
         desc = request.POST.get('desc')
         guide_img = request.POST.get('guide_img')
+        s_id = request.POST.get('id')
+        if s_id:
+            sight_obj = Sightsee_Info.objects.get(id=s_id)
+            sight_obj.name=name
+            sight_obj.price=price
+            sight_obj.location=location
+            sight_obj.sightsee_stime=sightsee_stime
+            sight_obj.sightsee_etime=sightsee_etime
+            sight_obj.sightsee_img=sightsee_img
+            sight_obj.sightsee_tel=sightsee_tel
+            sight_obj.addr=addr
+            sight_obj.guide_img=guide_img
+            sight_obj.content=content
+            sight_obj.desc=desc
+            sight_obj.save()
+            data = "1"
+            return HttpResponse(data)
         try:
             Sightsee_Info.objects.create(
                 name=name,
@@ -1498,7 +1515,7 @@ class Video_Check_List(ListView):
         if req == "edit":
             for i in art_obj:
                 data.append({
-                     "id":i.id,
+                    "id":i.id,
                     "title":i.title,
                     "intro":i.intro,
                     "video_img":i.video_img.name,
@@ -1796,7 +1813,7 @@ class Farm_Check_List(ListView):
     def get(self,request):
         hidden = request.GET.get('hidden')
         page = int(request.GET.get('page'))
-        art_list = Pick_Pub.objects.filter(hidden=hidden)
+        art_list = FarmList.objects.filter(hidden=hidden)
         nums = art_list.count()
         art = art_list[(10*(page-1)):(page*10)]
         return render(request, 'backstageNet/infoManage/farmManageList.html', context={"art":art,"nums":nums})
@@ -1871,11 +1888,19 @@ class Sightsee_Check_List(ListView):
         return render(request, 'backstageNet/infoManage/sightseeManageList.html', context={"sightsee":sightsee,"nums":nums})
     def post(self,request):
         s_id = request.POST.get('id')
-        # req = request.POST.get('req')
+        req = request.POST.get('req')
         i = Sightsee_Info.objects.get(id=s_id)
-        data = {"name":i.name,"price":i.price,"desc":i.desc,"location":i.location,"addr":i.addr,"sightsee_stime":i.sightsee_stime,"sightsee_etime":i.sightsee_etime,
+        if req == "edit":
+            data = {"name":i.name,"price":i.price,"desc":i.desc,"location":i.location,"addr":i.addr,"sightsee_stime":i.sightsee_stime,"sightsee_etime":i.sightsee_etime,
                 "sightsee_img":i.sightsee_img,"sightsee_tel":i.sightsee_tel,"upl_time":i.upl_time.strftime('%Y-%m-%d %H:%M:%S'),"guide_img":i.guide_img,"content":i.content}
-        data = json.dumps(data,ensure_ascii=False)
+            data = json.dumps(data,ensure_ascii=False)
+        elif req == "check":
+            i.hidden = True
+            i.save()
+            data = "1"
+        elif req == "del":
+            i.delete()
+            data = "1"
         return HttpResponse(data)
 
 
@@ -2248,7 +2273,8 @@ class Repertory_View(ListView):
     def get(self,request):
         return render(request, 'backstageNet/production/repertoryManage.html', context={})
     def post(self,request):
-         #库存id
+        uid = request.user.id
+        #库存id
         store_id = request.POST.get('id')
         #物料名称
         name = request.POST.get('name')
@@ -2258,6 +2284,8 @@ class Repertory_View(ListView):
         spec = request.POST.get('spec')
         #库存
         rese = request.POST.get('rese')
+        #园区
+        gradenid = request.POST.get('graden')
         #修改
         if store_id:
             try:
@@ -2274,11 +2302,13 @@ class Repertory_View(ListView):
         else:
             #新增
             try:
+                gradens=GardenArea.objects.get(id=gradenid)
                 Store_Manage.objects.create(
                     name=name,
                     rtype=rtype,
                     spec=spec,
                     rese=rese,
+                    graden=gradens
                 )
                 data = "1"
             except Exception as e:
@@ -2297,9 +2327,8 @@ class Repertory_New(ListView):
         current_user = MyUser.objects.get(username=username)
         ids = int(request.GET.get('ids'))
         try:
-            art = FarmList.objects.filter(garden=ids,user=current_user)
-            if art:
-                art_list = Store_Manage.objects.all()
+            art = GardenArea.objects.get(id=ids)
+            art_list = Store_Manage.objects.filter(graden=art)
             print(art_list)
         except Exception as e:
             print(e)
@@ -2549,41 +2578,28 @@ class CropCount_View(ListView):
         username = request.user.username
         print('username:',username)
         current_user = MyUser.objects.get(username=username)
-        art = GardenArea.objects.filter(user=current_user)
+        gardenid = request.GET.get("ids")
         page = int(request.GET.get("page"))
         dat = []
-        for i in art:
-            art_list = Areacrop.objects.filter(area=i)
-            for x in art_list:
-                # if x.end_time:
-                #     time = int(x.upl_time.strftime("%Y%m%d"))
-                #     time_now = int(x.end_time.strftime("%Y%m%d"))
-                #     data = time_now-time
-                #     curro = "当前阶段已结束" 
-                #     h2 = {"cropname":x.cropname,
-                #         "area":x.area.name,
-                #         "crop_count":x.crop_count,
-                #         "img":x.area.img,
-                #         "time":data,
-                #         "upl_time":x.upl_time.strftime('%Y-%m-%d'),
-                #         "id":x.id
-                #         } 
-                #     dat.append({"data":h2,"curro":curro})
-                # else:
-                time = int(x.upl_time.strftime("%Y%m%d"))
-                time_now = int(timezone.now().strftime("%Y%m%d"))
-                data = time_now-time
-                print(data)
-                curro = "" 
-                h2 = {"cropname":x.cropname,
-                    "area":x.area.name,
-                    "crop_count":x.crop_count,
-                    "img":x.area.img,
-                    "time":data,
-                    "id":x.id,
-                    "upl_time":x.upl_time.strftime('%Y-%m-%d')
-                    } 
-                dat.append({"data":h2,"curro":curro})
+        art = GardenArea.objects.filter(id=gardenid)
+        if art:
+            for i in art:
+                art_list = Areacrop.objects.filter(area=i)
+                for x in art_list:
+                    time = int(x.upl_time.strftime("%Y%m%d"))
+                    time_now = int(timezone.now().strftime("%Y%m%d"))
+                    data = time_now-time
+                    print(data)
+                    curro = "" 
+                    h2 = {"cropname":x.cropname,
+                        "area":x.area.name,
+                        "crop_count":x.crop_count,
+                        "img":x.area.img,
+                        "time":data,
+                        "id":x.id,
+                        "upl_time":x.upl_time.strftime('%Y-%m-%d')
+                        } 
+                    dat.append({"data":h2,"curro":curro})
         nums = len(dat)
         dat = dat[(9*(page-1)):(page*9)]
         data = json.dumps({"dat":dat,"nums":nums})
@@ -2608,7 +2624,7 @@ class CropCount_View(ListView):
                     "area":i.area.name,
                     "crop_count":i.crop_count,
                     "cropname":i.cropname,
-                    "upl_time":i.upl_time.strftime('%Y-%m-%d %H:%M:%S')
+                    "upl_time":i.upl_time.strftime('%Y-%m-%d')
                 })
         #删除
         elif req == "del":
@@ -2646,7 +2662,7 @@ class Pick(ListView):
                         "id":x.id,
                         "farm":x.farm.name,"name":x.name,
                         "num":x.num,"var":x.var,
-                        "time":x.upl_time.strftime('%Y-%m-%d %H:%M:%S')
+                        "time":x.upl_time.strftime('%Y-%m-%d')
                     })
         except Exception as e:
             print(e)

templates/backstageNet/production/cropcount.html

@@ -256,6 +256,7 @@
             //执行一个laydate实例
             laydate.render({
                 elem: '#timSelectBox' //指定元素
+                // , value: '2017-09-10'
                 , done: function (value, date) {
                     $('#time').val(value)
                 }
@@ -298,6 +299,7 @@
                                             //拼接字符串
                                             var str = '';
                                             //对数据做遍历，拼接到页面显示
+                                            // console.log(group)
                                             for (var i = 0; i < group.length; i++) {
                                                 var strSeparator = "-"; //日期分隔符
                                                 var oDate1
@@ -313,7 +315,7 @@
                                                 var strDateS = new Date(oDate1[0], oDate1[1] - 1, oDate1[2]);
                                                 var strDateE = new Date(oDate2[0], oDate2[1] - 1, oDate2[2]);
                                                 iDays = parseInt(Math.ceil(strDateS - strDateE) / 1000 / 60 / 60 / 24)//把相差的毫秒数转换为天数
-
+                                                // console.log(group[i].data.upl_time)
                                                 if (iDays > 0) {
                                                     //正数
                                                     var dateNum = iDays
@@ -370,6 +372,28 @@
                                                                 var str = '';
                                                                 //对数据做遍历，拼接到页面显示
                                                                 for (var i = 0; i < group.length; i++) {
+                                                                    var strSeparator = "-"; //日期分隔符
+                                                                    var oDate1
+                                                                    var oDate2
+                                                                    var strDateStart = new Date()
+                                                                    var Str = strDateStart.getFullYear() + '-' +
+                                                                        (strDateStart.getMonth() + 1) + '-' +
+                                                                        strDateStart.getDate() + ' '
+                                                                    var strDateEnd = group[i].data.upl_time
+                                                                    var iDays;
+                                                                    oDate1 = Str.split(strSeparator);
+                                                                    oDate2 = strDateEnd.split(strSeparator);
+                                                                    var strDateS = new Date(oDate1[0], oDate1[1] - 1, oDate1[2]);
+                                                                    var strDateE = new Date(oDate2[0], oDate2[1] - 1, oDate2[2]);
+                                                                    iDays = parseInt(Math.ceil(strDateS - strDateE) / 1000 / 60 / 60 / 24)//把相差的毫秒数转换为天数
+
+                                                                    if (iDays > 0) {
+                                                                        //正数
+                                                                        var dateNum = iDays
+                                                                    } else if (iDays < 0) {
+                                                                        //负数
+                                                                        var dateNum = 0
+                                                                    }
                                                                     str += '<div class="layui-col-xs6 layui-col-sm6 layui-col-md4">' +
                                                                         '<div class="userItem">' +
                                                                         '<div class="userMsg">' +
@@ -382,7 +406,7 @@
                                                                         '<p>所属农场：' + group[i].data.area + '</p>' +
                                                                         '<p>规　　模：' + group[i].data.crop_count + '</p>' +
                                                                         '<p>种植日期：' + group[i].data.upl_time + '</p>' +
-                                                                        '<p>已生长/天：' + group[i].data.time + '</p>' +
+                                                                        '<p>已生长/天：' + dateNum + '</p>' +
                                                                         '</div>' +
                                                                         '</div>' +
                                                                         '<div class="operateDiv">' +
@@ -447,6 +471,28 @@
                                 var str = '';
                                 //对数据做遍历，拼接到页面显示
                                 for (var i = 0; i < group.length; i++) {
+                                    var strSeparator = "-"; //日期分隔符
+                                    var oDate1
+                                    var oDate2
+                                    var strDateStart = new Date()
+                                    var Str = strDateStart.getFullYear() + '-' +
+                                        (strDateStart.getMonth() + 1) + '-' +
+                                        strDateStart.getDate() + ' '
+                                    var strDateEnd = group[i].data.upl_time
+                                    var iDays;
+                                    oDate1 = Str.split(strSeparator);
+                                    oDate2 = strDateEnd.split(strSeparator);
+                                    var strDateS = new Date(oDate1[0], oDate1[1] - 1, oDate1[2]);
+                                    var strDateE = new Date(oDate2[0], oDate2[1] - 1, oDate2[2]);
+                                    iDays = parseInt(Math.ceil(strDateS - strDateE) / 1000 / 60 / 60 / 24)//把相差的毫秒数转换为天数
+
+                                    if (iDays > 0) {
+                                        //正数
+                                        var dateNum = iDays
+                                    } else if (iDays < 0) {
+                                        //负数
+                                        var dateNum = 0
+                                    }
                                     str += '<div class="layui-col-xs6 layui-col-sm6 layui-col-md4">' +
                                         '<div class="userItem">' +
                                         '<div class="userMsg">' +
@@ -459,7 +505,7 @@
                                         '<p>所属农场：' + group[i].data.area + '</p>' +
                                         '<p>规　　模：' + group[i].data.crop_count + '</p>' +
                                         '<p>种植日期：' + group[i].data.upl_time + '</p>' +
-                                        '<p>已生长/天：' + group[i].data.time + '</p>' +
+                                        '<p>已生长/天：' + dateNum + '</p>' +
                                         '</div>' +
                                         '</div>' +
                                         '<div class="operateDiv">' +
@@ -496,6 +542,28 @@
                                                     var str = '';
                                                     //对数据做遍历，拼接到页面显示
                                                     for (var i = 0; i < group.length; i++) {
+                                                        var strSeparator = "-"; //日期分隔符
+                                                        var oDate1
+                                                        var oDate2
+                                                        var strDateStart = new Date()
+                                                        var Str = strDateStart.getFullYear() + '-' +
+                                                            (strDateStart.getMonth() + 1) + '-' +
+                                                            strDateStart.getDate() + ' '
+                                                        var strDateEnd = group[i].data.upl_time
+                                                        var iDays;
+                                                        oDate1 = Str.split(strSeparator);
+                                                        oDate2 = strDateEnd.split(strSeparator);
+                                                        var strDateS = new Date(oDate1[0], oDate1[1] - 1, oDate1[2]);
+                                                        var strDateE = new Date(oDate2[0], oDate2[1] - 1, oDate2[2]);
+                                                        iDays = parseInt(Math.ceil(strDateS - strDateE) / 1000 / 60 / 60 / 24)//把相差的毫秒数转换为天数
+
+                                                        if (iDays > 0) {
+                                                            //正数
+                                                            var dateNum = iDays
+                                                        } else if (iDays < 0) {
+                                                            //负数
+                                                            var dateNum = 0
+                                                        }
                                                         str += '<div class="layui-col-xs6 layui-col-sm6 layui-col-md4">' +
                                                             '<div class="userItem">' +
                                                             '<div class="userMsg">' +
@@ -508,7 +576,7 @@
                                                             '<p>所属农场：' + group[i].data.area + '</p>' +
                                                             '<p>规　　模：' + group[i].data.crop_count + '</p>' +
                                                             '<p>种植日期：' + group[i].data.upl_time + '</p>' +
-                                                            '<p>已生长/天：' + group[i].data.time + '</p>' +
+                                                            '<p>已生长/天：' + dateNum + '</p>' +
                                                             '</div>' +
                                                             '</div>' +
                                                             '<div class="operateDiv">' +
@@ -588,11 +656,18 @@
                     dataType: 'json',
                     success: function (data) {
                         selectModelFun()
-                        $('input[name="upl_time"]').val(data[0].upl_time)//开始日期
+                        // 去除面积中的中文字符
+                        var reg = /[\u4e00-\u9fa5]/g
+                        var str = data[0].crop_count
+                        var crop_count = str.replace(reg, '')
+                        // $('input[name="upl_time"]').val(data[0].upl_time)//开始日期
+                        // console.log(data[0].upl_time)
+                        $('#timSelectBox').val(data[0].upl_time)
                         $('input[name="cropname"]').val(data[0].cropname) //种植名称
-                        $('input[name="crop_count"]').val(data[0].crop_count) //面积
+                        $('input[name="crop_count"]').val(crop_count) //面积
                         $('input[name="area"]').val(data[0].area) //所属园区
                         $('input[name="id"]').val(data[0].id) //id
+                        form.render()
                     },
                     error: function (type) {
                         consloe.log(type)

templates/backstageNet/production/gardenManage.html

@@ -309,7 +309,7 @@
                             var id = data[i].id
                             var opt = "<option value='" + id + "'>" + name + "</option>"
                             $('#farmSelect').append(opt);
-                            form.render('select'); //刷新select选择框渲染
+                            // form.render('select'); //刷新select选择框渲染
                         }
 
 

templates/backstageNet/production/pick.html

@@ -352,6 +352,7 @@
         }
 
         function edit(dat) {
+            console.log(dat)
             form.val("sellForm", {
                 "farm": dat.farm
                 , "name": dat.name

templates/backstageNet/production/repertoryManage.html

@@ -120,15 +120,16 @@
         .numbox {
             display: none;
         }
+
         .number {
             width: 50%;
             margin: 15px auto;
         }
+
         .numberBtn {
             width: 50%;
             margin: 30px auto;
         }
-
     </style>
 </head>
 
@@ -146,20 +147,21 @@
         <!-- 内容 -->
         <div class="mainContent">
             <div class="widget-title">
-                <button type="button" class="layui-btn  layui-btn-normal layui-btn-sm fr" onclick="selectModelFun()">新增</button>
+                <button type="button" class="layui-btn  layui-btn-normal layui-btn-sm fr"
+                    onclick="selectModelFun()">新增</button>
                 <h2>
                     库存管理
                     <form class="layui-form" action="" style="display:inline-block;vertical-align: middle;">
                         <div class="layui-form-item" style="margin-bottom: 0;">
                             <label class="layui-form-label" style="color:#029eef">选择园区：</label>
-                            <div class="layui-input-inline" >
+                            <div class="layui-input-inline">
                                 <select name="city" id="farmSelect">
                                 </select>
                             </div>
                         </div>
-                    </form> 
+                    </form>
                 </h2>
-                
+
             </div>
             <div class="">
                 <div class="layui-row" id="box">
@@ -182,14 +184,16 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">物料名称：</label>
                     <div class="layui-input-inline">
-                        <input type="text" name="name" required lay-verify="required" placeholder="请输入物料名称" autocomplete="off" class="layui-input">
+                        <input type="text" name="name" required lay-verify="required" placeholder="请输入物料名称"
+                            autocomplete="off" class="layui-input">
                     </div>
                 </div>
 
                 <div class="layui-form-item">
                     <label class="layui-form-label">物料类别：</label>
                     <div class="layui-input-inline">
-                        <input type="text" name="rtype" required lay-verify="required" placeholder="请输入物料类别" autocomplete="off" class="layui-input">
+                        <input type="text" name="rtype" required lay-verify="required" placeholder="请输入物料类别"
+                            autocomplete="off" class="layui-input">
                     </div>
                 </div>
                 <!-- <div class="layui-form-item">
@@ -201,10 +205,10 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">库存：</label>
                     <div class="layui-input-inline">
-                        <input type="text" name="rese" required lay-verify="required" placeholder="请输入库存" autocomplete="off" class="layui-input">
+                        <input type="text" name="rese" required lay-verify="required" placeholder="请输入库存"
+                            autocomplete="off" class="layui-input">
                     </div>
                 </div>
-        
 
                 <div class="layui-form-item">
                     <div class="layui-input-block">
@@ -217,7 +221,8 @@
     </div>
 
     <div class="numbox" id="numbox">
-        <input type="number" id="number"  required lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input number">  
+        <input type="number" id="number" required lay-verify="required" placeholder="请输入数字" autocomplete="off"
+            class="layui-input number">
         <div class="numberBtn">
             <button class="layui-btn  layui-btn-normal" lay-submit lay-filter="formNumber">确定</button>
             <button type="reset" class="layui-btn layui-btn-primary" onclick="formquxiao()">取消</button>
@@ -244,14 +249,14 @@
                 }
             });
 
-             //园区下拉列表数据渲染
-             gedataA('park_land')
-             function gedataA(url) {
+            //园区下拉列表数据渲染
+            gedataA('park_land')
+            function gedataA(url) {
                 $.ajax({
                     url: 'park_land',
                     type: 'get',
                     data: {
-                        
+
                     },
                     dataType: 'json',
                     success: function (data) {
@@ -259,55 +264,53 @@
                         for (var i = 0; i < d.length; i++) {
                             var name = data[i].name
                             var id = data[i].id
-                            var opt = "<option value='" + id + "'>" + name + "</option>" 
+                            var opt = "<option value='" + id + "'>" + name + "</option>"
                             $('#farmSelect').append(opt);
                             form.render('select'); //刷新select选择框渲染
                         }
 
                         //页面数据渲染
                         gedata('repertory_new', 1)
-                            function gedata(url, page) {
-                                $.ajax({
-                                    url: 'repertory_new',
-                                    type: 'get',
-                                    data: {
-                                        page: page,
-                                        ids: $('#farmSelect option:eq(0)').val(),
-                                    },
-                                    dataType: 'html',
-                                    success: function (data) {
-
-                                        $('#box').children('#chunk').html(data);
-                                        laypage.render({
-                                            elem: 'page' //注意，这里的 test1 是 ID，不用加 # 号
-                                            , count: $('#totalPage').val()
-                                            , theme: '#2ca9f9'
-                                            , layout: ['prev', 'page', 'next', 'skip']
-                                            , jump: function (obj, first) {
-                                                if (!first) {
-                                                    $.ajax({
-                                                        url: 'repertory_new',
-                                                        type: 'get',
-                                                        data: { page: obj.curr, ids: $('#farmSelect option:eq(0)').val() },
-                                                        dataType: 'html',
-                                                        success: function (data) {
-                                                            console.log(data);
-                                                            $('#box').children('#chunk').html(data);
-                                                            console.log($('#totalPage').val());
-                                                        },
-                                                        error: function (type) {
-                                                            console.log(type)
-                                                        }
-                                                    })
-                                                }
+                        function gedata(url, page) {
+                            $.ajax({
+                                url: 'repertory_new',
+                                type: 'get',
+                                data: {
+                                    page: page,
+                                    ids: $('#farmSelect option:eq(0)').val(),
+                                },
+                                dataType: 'html',
+                                success: function (data) {
+                                    $('#box').children('#chunk').html(data);
+                                    laypage.render({
+                                        elem: 'page' //注意，这里的 test1 是 ID，不用加 # 号
+                                        , count: $('#totalPage').val()
+                                        , theme: '#2ca9f9'
+                                        , limit: '9'
+                                        , layout: ['prev', 'page', 'next', 'skip']
+                                        , jump: function (obj, first) {
+                                            if (!first) {
+                                                $.ajax({
+                                                    url: 'repertory_new',
+                                                    type: 'get',
+                                                    data: { page: obj.curr, ids: $('#farmSelect option:eq(0)').val() },
+                                                    dataType: 'html',
+                                                    success: function (data) {
+                                                        $('#box').children('#chunk').html(data);
+                                                    },
+                                                    error: function (type) {
+                                                        console.log(type)
+                                                    }
+                                                })
                                             }
-                                        });
-                                    },
-                                    error: function (type) {
-                                        console.log(type)
-                                    }
-                                })
-                            }
+                                        }
+                                    });
+                                },
+                                error: function (type) {
+                                    console.log(type)
+                                }
+                            })
+                        }
                     },
                     error: function (type) {
                         console.log(type)
@@ -315,11 +318,12 @@
                 })
             }
 
-             //编辑新增监听提交
-             form.on('submit(formDemo)', function (data) {
+            //编辑新增监听提交
+            form.on('submit(formDemo)', function (data) {
+                var dat = $("#formDiv").serialize() + '&graden=' + $("#farmSelect option:selected").val()
                 $.ajax({
                     url: 'repertory_view',
-                    data: $("#formDiv").serialize(),
+                    data: dat,
                     type: 'post',
                     success: function (res) {
                         clearForm()
@@ -344,8 +348,8 @@
                 return false;
             });
 
-             //出库入库监听提交
-             form.on('submit(formNumber)', function (data,id) {
+            //出库入库监听提交
+            form.on('submit(formNumber)', function (data, id) {
                 $.ajax({
                     url: 'repertory_new_view',
                     data: {
@@ -371,70 +375,71 @@
 
             });
 
-             //监听用户是否刷新，刷新页面删除本地存储的ID
-             $(function() {  
-                $(window).on('beforeunload', function() {  
+            //监听用户是否刷新，刷新页面删除本地存储的ID
+            $(function () {
+                $(window).on('beforeunload', function () {
                     // sessionStorage.removeItem('seelectID')
                     sessionStorage.removeItem('kuID')
                     sessionStorage.removeItem('req')
-                });  
+                });
             });
 
             //选择农场的下拉框监听回调
-            form.on('select()', function(data){
-            // sessionStorage.setItem('seelectID', data.value)
-            gedata('repertory_new', 1 )
-            function gedata(url, page) {
-                $.ajax({
-                    url: 'repertory_new',
-                    type: 'get',
-                    data: {
-                        page: page,
-                        ids: data.value,
-                    },
-                    dataType: 'html',
-                    success: function (data) {
-                        $('#box').children('#chunk').html(data);
-                        laypage.render({
-                            elem: 'page' //注意，这里的 test1 是 ID，不用加 # 号
-                            // , count: 30
-                            , count: $('#totalPage').val()
-                            , theme: '#2ca9f9'
-                            , layout: ['prev', 'page', 'next', 'skip']
-                            , jump: function (obj, first) {
-                                if (!first) {
-                                    $.ajax({
-                                        url: 'repertory_new',
-                                        type: 'get',
-                                        data: { page: obj.curr, ids: $('#farmSelect').val() },
-                                        dataType: 'html',
-                                        success: function (data) {
-                                            console.log(data);
-                                            $('#box').children('#chunk').html(data);
-                                            console.log($('#totalPage').val());
-                                        },
-                                        error: function (type) {
-                                            console.log(type)
-                                        }
-                                    })
+            form.on('select()', function (data) {
+                // sessionStorage.setItem('seelectID', data.value)
+                gedata('repertory_new', 1)
+                function gedata(url, page) {
+                    $.ajax({
+                        url: 'repertory_new',
+                        type: 'get',
+                        data: {
+                            page: page,
+                            ids: data.value,
+                        },
+                        dataType: 'html',
+                        success: function (data) {
+                            $('#box').children('#chunk').html(data);
+                            laypage.render({
+                                elem: 'page' //注意，这里的 test1 是 ID，不用加 # 号
+                                // , count: 30
+                                , count: $('#totalPage').val()
+                                , limit: '9'
+                                , theme: '#2ca9f9'
+                                , layout: ['prev', 'page', 'next', 'skip']
+                                , jump: function (obj, first) {
+                                    if (!first) {
+                                        $.ajax({
+                                            url: 'repertory_new',
+                                            type: 'get',
+                                            data: { page: obj.curr, ids: $('#farmSelect').val() },
+                                            dataType: 'html',
+                                            success: function (data) {
+                                                console.log(data);
+                                                $('#box').children('#chunk').html(data);
+                                                console.log($('#totalPage').val());
+                                            },
+                                            error: function (type) {
+                                                console.log(type)
+                                            }
+                                        })
+                                    }
                                 }
-                            }
-                        });
-                    },
-                    error: function (type) {
-                        console.log(type)
-                    }
-                })
-             }
+                            });
+                        },
+                        error: function (type) {
+                            console.log(type)
+                        }
+                    })
+                }
             });
         })
 
         //修改
-        function amend (id) {
+        function amend(id) {
             var idData = $('#farmSelect').val()
             var nameData = $('#farmSelect option:selected').text()
             if (idData !== '' && nameData !== '') {
-                    $.ajax({
+                $.ajax({
                     url: 'repertory_new',
                     type: 'post',
                     async: false,
@@ -444,7 +449,7 @@
                     },
                     dataType: 'json',
                     success: function (data) {
-                        selectModelFun ()
+                        selectModelFun()
                         $('input[name="name"]').val(data[0].name) //物料名称
                         $('input[name="rtype"]').val(data[0].rtype) //物料类别
                         $('input[name="spec"]').val(data[0].spec) //规格
@@ -462,8 +467,8 @@
         }
 
         //删除
-        function del (id) {
-            layer.confirm('真的删除行么',{title:'删除'}, function (index) {
+        function del(id) {
+            layer.confirm('真的删除行么', { title: '删除' }, function (index) {
                 console.log(id)
                 $.ajax({
                     url: 'repertory_new',
@@ -477,7 +482,7 @@
                         if (data) {
                             layer.close(index);
                             location.reload();
-                            layer.msg("操作成功!", {time: 1000, icon: 1})
+                            layer.msg("操作成功!", { time: 1000, icon: 1 })
                         }
                     }
                 })
@@ -485,17 +490,17 @@
         }
 
         //入库
-        function enter (id) {
+        function enter(id) {
             sessionStorage.setItem('kuID', id)
             sessionStorage.setItem('req', 'add')
-            repertory ()
+            repertory()
         }
 
         //出库
-        function come (id) {
+        function come(id) {
             sessionStorage.setItem('kuID', id)
             sessionStorage.setItem('req', 'see')
-            repertory ()
+            repertory()
         }
 
         //重置
@@ -516,16 +521,16 @@
             var idData = $('#farmSelect').val()
             var nameData = $('#farmSelect option:selected').text()
             if (idData !== '' && nameData !== '') {
-                    layui.use(['layer'], function () {
+                layui.use(['layer'], function () {
                     layer = layui.layer;
                     var index = layer.open({
                         type: 1,
                         title: '库存管理',
                         content: $('#selectModel'),
                         area: ['450px', '500px'],
-                        cancel: function(){
+                        cancel: function () {
                             // 右上角关闭事件的逻辑
-                            clearForm ()
+                            clearForm()
                         }
                     })
                 })
@@ -535,7 +540,7 @@
         }
 
         //出入库弹出层
-        function repertory () {
+        function repertory() {
             layui.use(['layer'], function () {
                 layer = layui.layer;
                 var index = layer.open({
@@ -543,7 +548,7 @@
                     title: '入库出库数量',
                     content: $('#numbox'),
                     area: ['400px', '200px'],
-                    cancel: function(){
+                    cancel: function () {
                         // 右上角关闭事件的逻辑
                         $(" #number ").val("")
                         sessionStorage.removeItem('kuID')
@@ -555,7 +560,7 @@
         }
 
         //出入库取消
-        function formquxiao () {
+        function formquxiao() {
             layer.closeAll();
             $(" #number ").val("")
             sessionStorage.removeItem('req')

templates/backstageNet/production/sellManage.html

@@ -134,14 +134,15 @@
         <div class="mainContent">
             <div class="widget-title">
                 <!-- <button type="button" class="layui-btn  layui-btn-normal layui-btn-sm fr" onclick="selectModelFun()">园区筛选</button> -->
-                <button type="button" class="layui-btn  layui-btn-normal layui-btn-sm fr" onclick="selectModelFun('新增')">新增</button>
+                <button type="button" class="layui-btn  layui-btn-normal layui-btn-sm fr"
+                    onclick="selectModelFun('新增')">新增</button>
                 <h2>销售管理
                     <!-- <span id="Uptime">草莓园商情站-设备：20126555</span> -->
                 </h2>
             </div>
             <div class="">
                 <div class="layui-row" id="sellList">
-            
+
                     <!-- <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
                         <div class="userItem">
                             <p class="username">牛奶草莓园</p>
@@ -179,49 +180,55 @@
         </div> -->
         <div>
             <form class="layui-form" action="" lay-filter="sellForm">
+                {% if area_list|length %}
                 <div class="layui-form-item">
                     <label class="layui-form-label">园区</label>
                     <div class="layui-input-block">
-                        <select name="farm" lay-verify="required" lay-search>
-                            {{farm_list}}
-                            {% for farm in farm_list %}
-                            <option value="{{farm.garden.name}}">{{farm.garden.name}}</option>
+                        <select name="garden" lay-verify="required" lay-filter="garden" id="garden" lay-search>
+                            {% for area in area_list %}
+                            <option value="{{area.id}}">{{area.name}}</option>
                             {% endfor %}
                         </select>
                     </div>
                 </div>
+                {% else %} {% endif %} {% if farm_list|length %}
                 <div class="layui-form-item">
                     <label class="layui-form-label">农场</label>
                     <div class="layui-input-block">
-                        <select name="farm" lay-verify="required" lay-search>
+                        <select name="farm" lay-verify="required" id="hacienda" lay-search>
                             {% for farm in farm_list %}
                             <option value="{{farm.name}}">{{farm.name}}</option>
                             {% endfor %}
                         </select>
                     </div>
                 </div>
+                {% else %} {% endif %}
                 <div class="layui-form-item">
                     <label class="layui-form-label">商品名称</label>
                     <div class="layui-input-block">
-                        <input type="text" name="name" required lay-verify="required" placeholder="请输入商品名称" autocomplete="off" class="layui-input">
+                        <input type="text" name="name" required lay-verify="required" placeholder="请输入商品名称"
+                            autocomplete="off" class="layui-input">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">时间</label>
                     <div class="layui-input-block">
-                        <input type="text" name="time" class="layui-input" required lay-verify="required" id="timSelectBox" autocomplete="off" placeholder="请输入销售时间">
+                        <input type="text" name="time" class="layui-input" required lay-verify="required"
+                            id="timSelectBox" autocomplete="off" placeholder="请输入销售时间">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">数量/公斤</label>
                     <div class="layui-input-block">
-                        <input type="number" name="num" required lay-verify="required" placeholder="请输入数量" autocomplete="off" class="layui-input">
+                        <input type="number" name="num" required lay-verify="required" placeholder="请输入数量"
+                            autocomplete="off" class="layui-input">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">金额/元</label>
                     <div class="layui-input-block">
-                        <input type="text" name="money" required lay-verify="required" placeholder="请输入金额" autocomplete="off" class="layui-input">
+                        <input type="text" name="money" required lay-verify="required" placeholder="请输入金额"
+                            autocomplete="off" class="layui-input">
                     </div>
                 </div>
 
@@ -261,6 +268,7 @@
             //监听提交
             form.on('submit(formDemo)', function (data) {
                 // layer.msg(JSON.stringify(data.field));
+                console.log(data.field)
                 $.ajax({
                     url: 'sell_new',
                     type: 'post',
@@ -275,10 +283,50 @@
                 return false;
             });
 
+             // 获取农场选择
+             form.on('select(garden)', function (data) {
+                $.ajax({
+                    url: 'contrast',
+                    type: 'post',
+                    dataType: 'json',
+                    data: {
+                        id: data.value
+                    },
+                    success: function (data) {
+                        if (data.length) {
+                            renderSelect(data);
+                        } else {
+                            $('#hacienda').html('');
+                            layui.use(['form'], function () {
+                                form.render('select'); //刷新select选择框渲染
+                            })
+                        }
+                    },
+                    error: function (type) {
+                        console.log(type)
+                    }
+                })
+            });
+
             getSellList(1, currPage)
 
         })
 
+        // 按照用户选中的园区进行农场渲染
+        function renderSelect(data) {
+            $('#hacienda').html('');
+            var html = '';
+            for (var i = 0; i < data.length; i++) {
+                html += '<option value="' + data[i].id + '">' + data[i].name + '</option>';
+                if (i == data.length - 1) {
+                    $('#hacienda').html(html);
+                    layui.use(['form'], function () {
+                        form.render('select'); //刷新select选择框渲染
+                    })
+                }
+            }
+        }
+
         var currPage = 1;
         function getSellList(page, currPage) {
             $.ajax({
@@ -378,6 +426,7 @@
 
 
         function selectModelFun(title) {
+            // gardenListData() //请求园区和农场列表数据
             layui.use(['layer'], function () {
                 layer = layui.layer;
                 var index = layer.open({
@@ -404,6 +453,30 @@
             })
             layer.closeAll();
         }
+
+        // 园区列表请求
+        // function gardenListData() {
+        //     $.ajax({
+        //         url: 'sell_land',
+        //         // url: 'sell_view',
+        //         type: 'get',
+        //         dataType: 'json',
+        //         success: function (data) {
+        //             if (data) {
+        //                 for (var i = 0; i < data.length; i++) {
+        //                     var garden = data[i].garden
+        //                     var farm_name = data[i].farm_name
+        //                     var html = '<option value=" ' + garden + '">' + garden + '</option>'
+        //                     var htmlA = '<option value=" ' + farm_name + '">' + farm_name + '</option>'
+        //                     $('#garden').append(html)
+        //                     $('#hacienda').append(htmlA)
+        //                     form.render('select')
+        //                 }
+        //             }
+        //         }
+        //     })
+        // }
+
     </script>
 </body>
 

templates/backstageNet/production/workerManage.html

@@ -485,7 +485,9 @@
         }
 
         function selectModelFun() {
-            if (sessionStorage.getItem('seelectID') !== null) {
+            var idData = $('#areaSelct').val()
+            var nameData = $('#areaSelct option:selected').text()
+            if (idData !== '' && nameData !== '') {
                 layui.use(['layer'], function () {
                     layer = layui.layer;
                     var index = layer.open({