From 61b5eef51c6083963fd543714b8bc140a34416bc Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Tue, 14 Feb 2023 16:41:26 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=8B=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/shopping/assets/common.css      |   3 +
 .../shopping/components/Order/placeOrder.vue  | 171 +++++++++++++++++-
 .../src/views/shopping/pages/sirendingzhi.vue |   4 +-
 3 files changed, 171 insertions(+), 7 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/shopping/assets/common.css b/ant-design-vue-jeecg/src/views/shopping/assets/common.css
index 78cd8e36..049bc78c 100644
--- a/ant-design-vue-jeecg/src/views/shopping/assets/common.css
+++ b/ant-design-vue-jeecg/src/views/shopping/assets/common.css
@@ -94,4 +94,7 @@ a {
 .c_1B {
   color: #1B1B1B;
 }
+.c_31 {
+  color: #313131;
+}
 .textfield {overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue b/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue
index 76f09151..c7d1b5c0 100644
--- a/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue
@@ -25,22 +25,131 @@
                 </a-radio-group>
               </a-form-item>
               <a-form-item
-                label="Field A"
+                label="称呼"
               >
-                <a-input placeholder="input placeholder" />
+                <a-select placeholder="请选择称呼" :value="userSex" style="width: 120px;margin-right:10px" @change="handleChange">
+                  <a-select-option value="1">
+                    先生
+                  </a-select-option>
+                  <a-select-option value="0">
+                    女士
+                  </a-select-option>
+                </a-select>
+                <a-input style="width:300px" placeholder="请输入姓名" :value="userName"/>
               </a-form-item>
               <a-form-item
-                label="Field B"
+                label="选择地址"
               >
                 <a-input placeholder="input placeholder" />
               </a-form-item>
+              <a-form-item
+                label="详细地址"
+              >
+                <a-textarea placeholder="请输入街道、门牌号码等详细地址" auto-size />
+              </a-form-item>
+              <a-form-item
+                label="手机号码"
+              >
+                <a-input style="width:150px;margin-right:10px" placeholder="+86 中国大陆地区" disabled/>
+                <a-input style="width:300px" placeholder="请输入手机号码" :value="userName"/>
+              </a-form-item>
+              <a-form-item>
+                <a-checkbox @change="onChange">
+                  保存该地址至地址簿
+                </a-checkbox>
+              </a-form-item>
+<!--              <a-form-item v-bind="formItemLayout" label="手机号码">-->
+<!--                <a-input-->
+<!--                  v-decorator="[-->
+<!--          'phone',-->
+<!--          {-->
+<!--            rules: [{ required: true, message: 'Please input your phone number!' }],-->
+<!--          },-->
+<!--        ]"-->
+<!--                >-->
+<!--                  <a-select-->
+<!--                    slot="addonBefore"-->
+<!--                    v-decorator="['prefix', { initialValue: '86' }]"-->
+<!--                    style="width: 70px"-->
+<!--                    default-value="86"-->
+<!--                  >-->
+<!--                    <a-select-option value="86">-->
+<!--                      +86 中国大陆地区-->
+<!--                    </a-select-option>-->
+<!--                    <a-select-option value="87">-->
+<!--                      +87 中国大陆地区-->
+<!--                    </a-select-option>-->
+<!--                  </a-select>-->
+<!--                </a-input>-->
+<!--              </a-form-item>-->
             </a-form>
           </div>
         </div>
-        <div class="addr"></div>
-        <div class="addr"></div>
+        <div class="addr">
+          <div class="title">
+            <span class="icon">2</span>
+            <span class="text f_18">支付方式</span></div>
+          <div class="pay">
+            <p class="f_12 c_1B">在线支付</p>
+            <a-radio-group v-model="paymentMode" @change="onChange1">
+              <a-radio :value="1">
+                <a-icon type="alipay" style="background:#08AAFF;color:#fff;border-radius: 2px;padding:1px;margin-right:3px"/>
+                <span>支付宝</span>
+              </a-radio>
+              <a-radio :value="2">
+                <a-icon type="wechat" style="background:#00B40C;color:#fff;border-radius: 2px;padding:1px;margin-right:3px"/>
+                <span>微信支付</span>
+              </a-radio>
+            </a-radio-group>
+          </div>
+          <a-checkbox @change="onChange">
+            需要电子发票
+          </a-checkbox>
+        </div>
+<!--        <div class="addr"></div>-->
+      </div>
+      <div class="rightDiv">
+        <div class="order">
+          <p class="d-flex title">
+            <span class="f_14 c_999">订单小计</span>
+            <span class="f_14 c_31">已选 1 件商品</span>
+          </p>
+          <div class="table d-flex">
+            <div class="left">
+<!--              <img src="">-->
+              <div class="img"></div>
+            </div>
+            <div class="right">
+              <p class="d-flex">
+                <span class="f_12 c_1B">关键词12定制款立领衬</span>
+                <span class="f_12 c_999">数量：1</span>
+              </p>
+              <p  class="f_12 c_999">款式：立领，标签2</p>
+              <p class="d-flex">
+                <span class="f_12 c_999">主辅料：主料1，辅料1，叮叮叮，辅料n</span>
+                <span class="f_12 c_999">数量：1</span>
+              </p>
+              <p  class="f_12 c_999">尺码： XXS</p>
+              <p class="d-flex">
+                <span class="f_12 c_999">定制</span>
+                <span class="f_12 c_999">￥35,500</span>
+              </p>
+            </div>
+          </div>
+          <p class="d-flex">
+            <span class="f_14 c_31">商品总计</span>
+            <span class="f_14 c_666">￥35,500</span>
+          </p>
+          <p class="d-flex">
+            <span class="f_14 c_31">运费</span>
+            <span class="f_14 c_999">免费</span>
+          </p>
+          <p class="d-flex title">
+            <span class="f_14 c_31">总计</span>
+            <span class="f_20 c_31">￥35,500</span>
+          </p>
+        </div>
       </div>
-      <div class="rightDiv">1</div>
     </div>
 
   </div>
@@ -50,6 +159,10 @@
     data() {
       return {
         formLayout: 'horizontal',
+        userSex:'',//性别
+        userName:'',//姓名
+        value: 1,
+        paymentMode:'',//支付方式
       };
     },
     computed: {
@@ -75,12 +188,22 @@
       handleFormLayoutChange(e) {
         this.formLayout = e.target.value;
       },
+      handleChange(value) {
+        this.userSex = value
+      },
+      onChange(e) {
+        console.log(`checked = ${e.target.checked}`);
+      },
+      onChange1(e) {
+        console.log('radio checked', e.target.value);
+      },
     },
   };
 </script>
 <style lang="less" scoped>
   .placeOrder{
     padding-top: 54px;
+    padding-bottom: 80px;
     background-color: #F6F6F6;
     & >.jz{
       justify-content: space-around;
@@ -123,6 +246,15 @@
         .addr{
           background-color: #fff;
           padding:0 30px 30px 30px;
+          margin-bottom: 25px;
+          .pay{
+            padding: 47px 20px;
+            border-bottom: 1px solid #EAEAEA;
+            margin-bottom: 20px;
+            .ant-radio-wrapper{
+              margin-right: 20px;
+            }
+          }
         }
         .form{
           background-color: #fff;
@@ -131,6 +263,33 @@
        }
       .rightDiv{
         width: 410px;
+        .order{
+          background: #FFFFFF;
+          padding: 24px 43px;
+          .d-flex{
+            justify-content: space-between;
+            .left{
+              width: 60px;
+            }
+            .right{
+              width: 250px;
+            }
+          }
+          &>.d-flex{
+            padding: 10px 0;
+          }
+          &>.title.d-flex{
+            border-bottom: 1px solid #E7E7E7;
+            padding: 20px 0;
+          }
+          .left{
+            .img{
+              background: #D9D9D9;
+              width: 60px;
+              height: 77px;
+            }
+          }
+        }
       }
     }
   }
diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/sirendingzhi.vue b/ant-design-vue-jeecg/src/views/shopping/pages/sirendingzhi.vue
index a07c18df..923fe2a5 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/sirendingzhi.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/sirendingzhi.vue
@@ -155,14 +155,16 @@
     <div v-if="current == 3">
       <PlaceOrder></PlaceOrder>
     </div>
+    <Footer></Footer>
   </div>
 </template>
 <script>
   import Header from "../components/Header/HeaderView";
+  import Footer from "../components/Footer/FooterView";
   import PlaceOrder from "../components/Order/placeOrder"
   export default {
     name: "sirendingzhi",
-    components: { Header ,PlaceOrder},
+    components: { Header ,PlaceOrder,Footer},
     data() {
       return {
         current: 3,

From b85dc8c03e87050edb48b8a178aeacf3aaa09ec7 Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Tue, 14 Feb 2023 16:50:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=88=90=E8=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/shopping/pages/chengyi.vue      | 482 ++++++++++--------
 1 file changed, 262 insertions(+), 220 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/chengyi.vue b/ant-design-vue-jeecg/src/views/shopping/pages/chengyi.vue
index d880218c..8369464e 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/chengyi.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/chengyi.vue
@@ -1,75 +1,76 @@
 <template>
-<!--  服装类型-->
+  <!--  成衣推荐-->
   <div class="chengyi">
 
-      <Header fontColor="#000"></Header>
-      <div class="main">
-        <div class="jz d-flex">
-          <el-menu
-            class="el-menu-vertical-demo"
-            @select="handleSelet"
-            style="width: 10%; min-width: 140px"
-            :unique-opened="true"
-          >
-            <el-submenu v-for="(item, i) in typeData" :key="i" :index="item.id">
-              <template slot="title">
-                <i class="el-icon-male"></i>
-                <span>{{ item.name }}</span>
-              </template>
-              <el-submenu v-for="(j, i2) in item.childrens" :key="i2" :index="j.id">
-                <template slot="title">{{ j.name }}</template>
-                <el-menu-item v-for="(k, i3) in j.childrens" :key="i3" :index="k.id">{{ k.name }}</el-menu-item>
-              </el-submenu>
-            </el-submenu>
-          </el-menu>
-          <div class="right">
-            <div class="name d-flex">
-              <span>{{this.current.name}}</span>
-              <div class="d-flex">
-                <el-dropdown @command="handleCommand">
+    <Header fontColor="#000"></Header>
+    <div class="main">
+      <div class="jz d-flex">
+        <el-menu
+          class="el-menu-vertical-demo"
+          @select="handleSelet"
+          style="width: 10%; min-width: 140px"
+          :unique-opened="true"
+        >
+          <el-submenu v-for="(item, i) in typeData" :key="i" :index="item.id">
+            <template slot="title">
+              <i class="el-icon-male"></i>
+              <span>{{ item.name }}</span>
+            </template>
+            <el-menu-item v-for="(j, i2) in item.childrens" :key="i2" :index="j.id">{{ j.name }}</el-menu-item>
+            <!--              <el-submenu v-for="(j, i2) in item.childrens" :key="i2" :index="j.id">-->
+            <!--                <template slot="title">{{ j.name }}</template>-->
+            <!--                <el-menu-item v-for="(k, i3) in j.childrens" :key="i3" :index="k.id">{{ k.name }}</el-menu-item>-->
+            <!--              </el-submenu>-->
+          </el-submenu>
+        </el-menu>
+        <div class="right">
+          <div class="name d-flex">
+            <span>{{this.current.name}}</span>
+            <div class="d-flex">
+              <el-dropdown @command="handleCommand">
                 <span class="el-dropdown-link">
                   排序<i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
-                  <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item command="heat">热度</el-dropdown-item>
-<!--                    <el-dropdown-item command="esteem">评分</el-dropdown-item>-->
-                    <el-dropdown-item command="high">价格降序</el-dropdown-item>
-                    <el-dropdown-item command="low">价格升序</el-dropdown-item>
-                  </el-dropdown-menu>
-                </el-dropdown>
-<!--                <div class="iconDiv d-flex">-->
-<!--                  <span>价格</span>-->
-<!--                  <div class="icon d-flex">-->
-<!--                    <i class="el-icon-arrow-up"></i>-->
-<!--                    <i class="el-icon-arrow-down"></i>-->
-<!--                  </div>-->
-<!--                </div>-->
-              </div>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="heat">热度</el-dropdown-item>
+                  <!--                    <el-dropdown-item command="esteem">评分</el-dropdown-item>-->
+                  <el-dropdown-item command="high">价格降序</el-dropdown-item>
+                  <el-dropdown-item command="low">价格升序</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+              <!--                <div class="iconDiv d-flex">-->
+              <!--                  <span>价格</span>-->
+              <!--                  <div class="icon d-flex">-->
+              <!--                    <i class="el-icon-arrow-up"></i>-->
+              <!--                    <i class="el-icon-arrow-down"></i>-->
+              <!--                  </div>-->
+              <!--                </div>-->
             </div>
-            <div class="clothDiv d-flex">
-              <div
-                class="item"
-                v-for="(item, index) in clothsList"
-                :key="index"
-                @click="clothDetails(item)"
-              >
-                <div class="imgDiv">
-                  <img :src="item.imgUrl" alt="" />
-                </div>
-                <div class="clothTitle">
-                  <p class="price d-flex">
-                    <span class="f_16 c_333">￥{{ item.currentPrice }}</span>
-                    <span class="f_12 c_999">￥{{ item.historicalPrice }}</span>
-                  </p>
-                  <p class="f_12 c_333">{{ item.title }}</p>
-                  <p class="f_12 c_9a9b9b">热度{{ item.heat }}</p>
-                </div>
+          </div>
+          <div class="clothDiv d-flex">
+            <div
+              class="item"
+              v-for="(item, index) in clothsList"
+              :key="index"
+              @click="clothDetails(item)"
+            >
+              <div class="imgDiv">
+                <img :src="item.imgUrl" alt="" />
+              </div>
+              <div class="clothTitle">
+                <p class="price d-flex">
+                  <span class="f_16 c_333">￥{{ item.currentPrice }}</span>
+                  <span class="f_12 c_999">￥{{ item.historicalPrice }}</span>
+                </p>
+                <p class="f_12 c_333">{{ item.title }}</p>
+                <p class="f_12 c_9a9b9b">热度{{ item.heat }}</p>
               </div>
             </div>
           </div>
         </div>
       </div>
     </div>
+  </div>
 
 </template>
 <script>
@@ -195,82 +196,64 @@
             name: "男装",
             childrens: [
               {
-                id: '11',
-                name: "上衣",
-                childrens: [
-                  {
-                    id: '111',
-                    name: "衬衫",
-                  },
-                  {
-                    id: '112',
-                    name: "卫衣",
-                  },
-                  {
-                    id: '113',
-                    name: "Polo衫",
-                  },
-                  {
-                    id: '114',
-                    name: "针织衫",
-                  },
-                ],
-              },
-              {
-                id: '12',
-                name: "外套",
-                childrens: [
-                  {
-                    id: '121',
-                    name: "夹克",
-                  },
-                  {
-                    id: '122',
-                    name: "羽绒服",
-                  },
-                  {
-                    id: '123',
-                    name: "风衣",
-                  },
-                ],
-              },
-              {
-                id: '13',
-                name: "裤子",
-                childrens: [
-                  {
-                    id: '131',
-                    name: "休闲裤",
-                  },
-                  {
-                    id: '132',
-                    name: "西裤",
-                  },
-                  {
-                    id: '133',
-                    name: "工装裤",
-                  },
-                  {
-                    id: '134',
-                    name: "运动裤",
-                  },
-                  {
-                    id: '135',
-                    name: "卫裤",
-                  },
-                  {
-                    id: '136',
-                    name: "九分裤",
-                  },
-                  {
-                    id: '137',
-                    name: "短裤",
-                  },
-                  {
-                    id: '138',
-                    name: "哈伦裤",
-                  },
-                ],
+                id: '111',
+                name: "衬衫",
+              },
+              {
+                id: '112',
+                name: "卫衣",
+              },
+              {
+                id: '113',
+                name: "Polo衫",
+              },
+              {
+                id: '114',
+                name: "针织衫",
+              },
+              {
+                id: '121',
+                name: "夹克",
+              },
+              {
+                id: '122',
+                name: "羽绒服",
+              },
+              {
+                id: '123',
+                name: "风衣",
+              },
+              {
+                id: '131',
+                name: "休闲裤",
+              },
+              {
+                id: '132',
+                name: "西裤",
+              },
+              {
+                id: '133',
+                name: "工装裤",
+              },
+              {
+                id: '134',
+                name: "运动裤",
+              },
+              {
+                id: '135',
+                name: "卫裤",
+              },
+              {
+                id: '136',
+                name: "九分裤",
+              },
+              {
+                id: '137',
+                name: "短裤",
+              },
+              {
+                id: '138',
+                name: "哈伦裤",
               },
             ],
           },
@@ -279,82 +262,130 @@
             name: "女装",
             childrens: [
               {
-                id: '21',
-                name: "上衣",
-                childrens: [
-                  {
-                    id: '211',
-                    name: "衬衫",
-                  },
-                  {
-                    id: '212',
-                    name: "卫衣",
-                  },
-                  {
-                    id: '213',
-                    name: "Polo衫",
-                  },
-                  {
-                    id: '214',
-                    name: "针织衫",
-                  },
-                ],
-              },
-              {
-                id: '22',
-                name: "外套",
-                childrens: [
-                  {
-                    id: '221',
-                    name: "夹克",
-                  },
-                  {
-                    id: '222',
-                    name: "羽绒服",
-                  },
-                  {
-                    id: '223',
-                    name: "风衣",
-                  },
-                ],
-              },
-              {
-                id: '23',
-                name: "裤子",
-                childrens: [
-                  {
-                    id: '231',
-                    name: "休闲裤",
-                  },
-                  {
-                    id: '232',
-                    name: "西裤",
-                  },
-                  {
-                    id: '233',
-                    name: "工装裤",
-                  },
-                  {
-                    id: '234',
-                    name: "运动裤",
-                  },
-                  {
-                    id: '235',
-                    name: "卫裤",
-                  },
-                  {
-                    id: '236',
-                    name: "九分裤",
-                  },
-                  {
-                    id: '237',
-                    name: "短裤",
-                  },
-                  {
-                    id: '238',
-                    name: "哈伦裤",
-                  },
-                ],
+                id: '211',
+                name: "衬衫",
+              },
+              {
+                id: '212',
+                name: "卫衣",
+              },
+              {
+                id: '213',
+                name: "Polo衫",
+              },
+              {
+                id: '214',
+                name: "针织衫",
+              },
+              {
+                id: '221',
+                name: "夹克",
+              },
+              {
+                id: '222',
+                name: "羽绒服",
+              },
+              {
+                id: '223',
+                name: "风衣",
+              },
+              {
+                id: '231',
+                name: "休闲裤",
+              },
+              {
+                id: '232',
+                name: "西裤",
+              },
+              {
+                id: '233',
+                name: "工装裤",
+              },
+              {
+                id: '234',
+                name: "运动裤",
+              },
+              {
+                id: '235',
+                name: "卫裤",
+              },
+              {
+                id: '236',
+                name: "九分裤",
+              },
+              {
+                id: '237',
+                name: "短裤",
+              },
+              {
+                id: '238',
+                name: "哈伦裤",
+              },
+            ],
+          },
+          {
+            id: '3',
+            name: "童装",
+            childrens: [
+              {
+                id: '311',
+                name: "衬衫",
+              },
+              {
+                id: '312',
+                name: "卫衣",
+              },
+              {
+                id: '313',
+                name: "Polo衫",
+              },
+              {
+                id: '314',
+                name: "针织衫",
+              },
+              {
+                id: '321',
+                name: "夹克",
+              },
+              {
+                id: '322',
+                name: "羽绒服",
+              },
+              {
+                id: '323',
+                name: "风衣",
+              },
+              {
+                id: '331',
+                name: "休闲裤",
+              },
+              {
+                id: '332',
+                name: "西裤",
+              },
+              {
+                id: '333',
+                name: "工装裤",
+              },
+              {
+                id: '334',
+                name: "运动裤",
+              },
+              {
+                id: '335',
+                name: "卫裤",
+              },
+              {
+                id: '336',
+                name: "九分裤",
+              },
+              {
+                id: '337',
+                name: "短裤",
+              },
+              {
+                id: '338',
+                name: "哈伦裤",
               },
             ],
           },
@@ -362,7 +393,8 @@
         // 目前选择的菜单
         current:{
           id:'',
-          name:''
+          name:'',
+          parrentName:''
         }
       };
     },
@@ -374,19 +406,24 @@
         const indexb =  this.typeData[indexa].childrens.findIndex((value, keys, arr) => {
           return value.id == indexPath[1]
         })
-        const indexc =  this.typeData[indexa].childrens[indexb].childrens.findIndex((value, keys, arr) => {
-          return value.id == indexPath[2]
-        })
-        this.current.name =  this.typeData[indexa].childrens[indexb].childrens[indexc].name
-        this.current.id =  this.typeData[indexa].childrens[indexb].childrens[indexc].id
+        // const indexc =  this.typeData[indexa].childrens[indexb].childrens.findIndex((value, keys, arr) => {
+        //   return value.id == indexPath[2]
+        // })
+        // this.current.name =  this.typeData[indexa].childrens[indexb].childrens[indexc].name
+        // this.current.id =  this.typeData[indexa].childrens[indexb].childrens[indexc].id
+        this.current.name =  this.typeData[indexa].childrens[indexb].name
+        this.current.id =  this.typeData[indexa].childrens[indexb].id
+        this.current.parrentName =  this.typeData[indexa].name
       },
       handleSelet(index,indexPath){
         this.findIndex(indexPath)
+        //这里更改右边显示衣服的数据,通过this.current.id查
+        // this.clothsList
       },
       clothDetails(item) {
         this.$router.push({
           path: "/shopping/ClothDetail",
-          query: { id: item.id, title: item.title },
+          query: { id: item.id, title: item.title ,name:this.current.name,parentName:this.current.parrentName},
         });
       },
       handleCommand(command){
@@ -396,8 +433,8 @@
         else if(command == 'high'){//价格降序
           this.clothsList.sort(compareDown("currentPrice"))
         }
-        // else if(command == 'esteem'){//按评分排序
-        //   this.clothsList.sort(compare("heat"))
+          // else if(command == 'esteem'){//按评分排序
+          //   this.clothsList.sort(compare("heat"))
         // }
 
         else if(command == 'low'){//价格升序
@@ -405,6 +442,11 @@
         }
       }
     },
+    mounted() {
+      this.current.name =  this.typeData[0].childrens[0].name
+      this.current.id =  this.typeData[0].childrens[0].id
+      this.current.parrentName =  this.typeData[0].name
+    }
   }
 </script>
 <style scoped>

From 1f4b304e427fd69f42ec5ed4937ffad19708b923 Mon Sep 17 00:00:00 2001
From: wangjiadong <1654135867@qq.com>
Date: Tue, 14 Feb 2023 17:24:46 +0800
Subject: [PATCH 3/3] xiugaibufen

---
 .../views/productrecord/ProductRecordList.vue | 12 +--
 .../modules/ProductRecordForm.vue             | 13 ++-
 .../src/views/sensor/modules/SensorForm.vue   |  2 +-
 .../sensorrecord/modules/SensorRecordForm.vue |  2 +-
 .../controller/ProductRecordController.java   | 20 +++--
 .../productrecord/entity/ProductRecord.java   | 88 +++++++++----------
 6 files changed, 73 insertions(+), 64 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/productrecord/ProductRecordList.vue b/ant-design-vue-jeecg/src/views/productrecord/ProductRecordList.vue
index 45e10817..47929581 100644
--- a/ant-design-vue-jeecg/src/views/productrecord/ProductRecordList.vue
+++ b/ant-design-vue-jeecg/src/views/productrecord/ProductRecordList.vue
@@ -11,7 +11,7 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="工单编号">
-              <j-search-select-tag placeholder="请选择工单编号" v-model="queryParam.orderCode" dict="findgdbh,order_id,order_code,id,orders_num"/>
+              <j-popup placeholder="请选择工单编号" v-model="queryParam.orderCode" code="findgdbh" org-fields="id,orders_num" dest-fields="order_id,order_code" :field="getPopupField('order_id,order_code')" :multi="true"/>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -157,7 +157,7 @@
           {
             title:'工单编号',
             align:"center",
-            dataIndex: 'orderId'
+            dataIndex: 'orderId_dictText'
           },
           {
             title:'生产开始时间',
@@ -194,14 +194,14 @@
           deleteBatch: "/productrecord/productRecord/deleteBatch",
           exportXlsUrl: "/productrecord/productRecord/exportXls",
           importExcelUrl: "productrecord/productRecord/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
       }
     },
     created() {
-    this.getSuperFieldList();
+      this.getSuperFieldList();
     },
     computed: {
       importExcelUrl: function(){
@@ -215,8 +215,8 @@
         let fieldList=[];
         fieldList.push({type:'sel_search',value:'stationId',text:'工位',dictTable:'station', dictText:'station_name', dictCode:'id'})
         fieldList.push({type:'popup',value:'stationName',text:'工位', popup:{code:'findgw',field:'id',orgFields:'id',destFields:'station_id'}})
-        fieldList.push({type:'sel_search',value:'orderCode',text:'工单编号',dictTable:'findgdbh', dictText:'order_id,order_code', dictCode:'id,orders_num'})
-        fieldList.push({type:'popup',value:'orderId',text:'工单编号', popup:{code:'work_order',field:'id',orgFields:'id',destFields:'product_code'}})
+        fieldList.push({type:'popup',value:'orderCode',text:'工单编号', popup:{code:'findgdbh',field:'id',orgFields:'id',destFields:'order_id'}})
+        fieldList.push({type:'sel_search',value:'orderId',text:'工单编号',dictTable:'work_order', dictText:'product_code', dictCode:'id'})
         fieldList.push({type:'datetime',value:'workTime',text:'生产开始时间'})
         fieldList.push({type:'datetime',value:'offTime',text:'生产结束时间'})
         fieldList.push({type:'string',value:'duration',text:'时长',dictCode:''})
diff --git a/ant-design-vue-jeecg/src/views/productrecord/modules/ProductRecordForm.vue b/ant-design-vue-jeecg/src/views/productrecord/modules/ProductRecordForm.vue
index 79bc5bc6..6b0ba9c6 100644
--- a/ant-design-vue-jeecg/src/views/productrecord/modules/ProductRecordForm.vue
+++ b/ant-design-vue-jeecg/src/views/productrecord/modules/ProductRecordForm.vue
@@ -13,12 +13,20 @@
                 code="findgw"
                 :multi="true"
                 @input="popupCallback"
-                />
+              />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="工单编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderCode">
-              <j-search-select-tag v-model="model.orderCode" dict="findgdbh,order_id,order_code,id,orders_num"  />
+              <j-popup
+                v-model="model.orderCode"
+                field="orderCode"
+                org-fields="id,orders_num"
+                dest-fields="orderId,orderCode"
+                code="findgdbh"
+                :multi="true"
+                @input="popupCallback"
+              />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -46,7 +54,6 @@
     </j-form-container>
   </a-spin>
 </template>
-
 <script>
 
   import { httpAction, getAction } from '@/api/manage'
diff --git a/ant-design-vue-jeecg/src/views/sensor/modules/SensorForm.vue b/ant-design-vue-jeecg/src/views/sensor/modules/SensorForm.vue
index 0b8a7f4f..3d935f09 100644
--- a/ant-design-vue-jeecg/src/views/sensor/modules/SensorForm.vue
+++ b/ant-design-vue-jeecg/src/views/sensor/modules/SensorForm.vue
@@ -10,7 +10,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="车间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workshopId">
-              <j-search-select-tag v-model="model.workshopId" dict="sys_depart,depart_name,id"  />
+              <j-search-select-tag v-model="model.workshopId" dict="sys_depart,depart_name,id"  disabled/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
diff --git a/ant-design-vue-jeecg/src/views/sensorrecord/modules/SensorRecordForm.vue b/ant-design-vue-jeecg/src/views/sensorrecord/modules/SensorRecordForm.vue
index a68dd0a8..203ba9ef 100644
--- a/ant-design-vue-jeecg/src/views/sensorrecord/modules/SensorRecordForm.vue
+++ b/ant-design-vue-jeecg/src/views/sensorrecord/modules/SensorRecordForm.vue
@@ -130,7 +130,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/productrecord/controller/ProductRecordController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/productrecord/controller/ProductRecordController.java
index 7955ba66..0c92e92f 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/productrecord/controller/ProductRecordController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/productrecord/controller/ProductRecordController.java
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.demo.productrecord.utils.quartz;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -51,15 +52,16 @@ public class ProductRecordController extends JeecgController<ProductRecord, IPro
 	@Autowired
 	private IProductRecordService productRecordService;
 
-	/**
-	 * 分页列表查询
-	 *
-	 * @param productRecord
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
+
+			 /**
+              * 分页列表查询
+              *
+              * @param productRecord
+              * @param pageNo
+              * @param pageSize
+              * @param req
+              * @return
+              */
 	@AutoLog(value = "生产记录表-分页列表查询")
 	@ApiOperation(value="生产记录表-分页列表查询", notes="生产记录表-分页列表查询")
 	@GetMapping(value = "/list")
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/productrecord/entity/ProductRecord.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/productrecord/entity/ProductRecord.java
index 19f34672..14ec21ce 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/productrecord/entity/ProductRecord.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/productrecord/entity/ProductRecord.java
@@ -32,66 +32,66 @@ import lombok.experimental.Accessors;
 public class ProductRecord implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
-    private String id;
-	/**创建人*/
+    private java.lang.String id;
+    /**创建人*/
     @ApiModelProperty(value = "创建人")
-    private String createBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.lang.String createBy;
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建日期")
-    private Date createTime;
-	/**更新人*/
+    private java.util.Date createTime;
+    /**更新人*/
     @ApiModelProperty(value = "更新人")
-    private String updateBy;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.lang.String updateBy;
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
-    private Date updateTime;
-	/**所属部门*/
+    private java.util.Date updateTime;
+    /**所属部门*/
     @ApiModelProperty(value = "所属部门")
-    private String sysOrgCode;
-	/**工位*/
-	@Excel(name = "工位", width = 15, dictTable = "station", dicText = "station_name", dicCode = "id")
-	@Dict(dictTable = "station", dicText = "station_name", dicCode = "id")
+    private java.lang.String sysOrgCode;
+    /**工位*/
+    @Excel(name = "工位", width = 15, dictTable = "station", dicText = "station_name", dicCode = "id")
+    @Dict(dictTable = "station", dicText = "station_name", dicCode = "id")
     @ApiModelProperty(value = "工位")
-    private String stationId;
-	/**工位*/
-	@Excel(name = "工位", width = 15)
+    private java.lang.String stationId;
+    /**工位*/
+    @Excel(name = "工位", width = 15)
     @ApiModelProperty(value = "工位")
-    private String stationName;
-	/**工单编号*/
-	@Excel(name = "工单编号", width = 15, dictTable = "findgdbh", dicText = "order_id,order_code", dicCode = "id,orders_num")
-	@Dict(dictTable = "findgdbh", dicText = "order_id,order_code", dicCode = "id,orders_num")
+    private java.lang.String stationName;
+    /**工单编号*/
+    @Excel(name = "工单编号", width = 15)
     @ApiModelProperty(value = "工单编号")
-    private String orderCode;
-	/**工单编号*/
-	@Excel(name = "工单编号", width = 15)
+    private java.lang.String orderCode;
+    /**工单编号*/
+    @Excel(name = "工单编号", width = 15, dictTable = "work_order", dicText = "product_code", dicCode = "id")
+    @Dict(dictTable = "work_order", dicText = "product_code", dicCode = "id")
     @ApiModelProperty(value = "工单编号")
-    private String orderId;
-	/**生产开始时间*/
-	@Excel(name = "生产开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.lang.String orderId;
+    /**生产开始时间*/
+    @Excel(name = "生产开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "生产开始时间")
-    private Date workTime;
-	/**生产结束时间*/
-	@Excel(name = "生产结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.util.Date workTime;
+    /**生产结束时间*/
+    @Excel(name = "生产结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "生产结束时间")
-    private Date offTime;
-	/**时长*/
-	@Excel(name = "时长", width = 15)
+    private java.util.Date offTime;
+    /**时长*/
+    @Excel(name = "时长", width = 15)
     @ApiModelProperty(value = "时长")
-    private String duration;
-	/**状态*/
-	@Excel(name = "状态", width = 15, dicCode = "cgqzt")
-	@Dict(dicCode = "cgqzt")
+    private java.lang.String duration;
+    /**状态*/
+    @Excel(name = "状态", width = 15, dicCode = "cgqzt")
+    @Dict(dicCode = "cgqzt")
     @ApiModelProperty(value = "状态")
-    private String status;
+    private java.lang.String status;
 }