+++

src/App.vue

@@ -15,4 +15,11 @@
     height: 100%;
     background: url(./assets/images/index_bg.png) center center / 100% 100% no-repeat fixed;
   }
+  .amap-sug-result{
+    position: absolute;
+    z-index: 2025;
+    background-color: #fefefe;
+    border: 1px solid #d1d1d1;
+    bottom: auto;
+  }
 </style>

src/api/freezer.js

@@ -61,3 +61,12 @@ export function bindCoolerBox(parameter) {
     data: parameter
   })
 }
+
+// 修改绑定保温箱
+export function UnbindCoolerBox(parameter) {
+  return request({
+    url: '/api/ice-raft/UnbindCoolerBox',
+    method: 'post',
+    data: parameter
+  })
+}

src/assets/js/blockSort.js

@@ -101,6 +101,18 @@ export const iceraftStatus = () => {
     value: '1',
   }]
 }
+
+export const usageStatus = () => {
+  return [{
+    bgcolor: '#409EFF',
+    label: '正在使用',
+    value: '1',
+  }, {
+    bgcolor: '#67C23A',
+    label: '使用完成',
+    value: '2',
+  }]
+}
 export const allocationState = () => {
   return [{
     bgcolor: '#F56C6C',
@@ -150,6 +162,10 @@ export const frozenState = () => {
     bgcolor: '#ff9900',
     label: '释冷中',
     value: '5',
+  }, {
+    bgcolor: '#67C23A',
+    label: '释冷完成',
+    value: '6',
   }]
 }
 

src/components/actionBar.vue

@@ -113,7 +113,7 @@
       },
       // 搜索
       searchProtocol() {
-        // console.log(this.ruleForm, '搜索')
+        console.log(this.ruleForm, '搜索')
         this.$emit('searchProtocol', this.ruleForm)
       },
       // 重置
@@ -138,6 +138,10 @@
 </script>
 
 <style lang="scss" scoped>
+  ::v-deep .el-form-item__label {
+    pointer-events: none !important;
+  }
+
   .actionbar_card {
     display: flex;
     flex-direction: column;

src/components/forms.vue

@@ -12,6 +12,14 @@
               :show-password="['newPassword','password'].includes(item.field) ? true : false"></el-input>
             <div class="unit_card" v-if="item.unit">{{item.unit}}</div>
           </el-form-item>
+          <!-- 坐标 -->
+          <el-form-item class="card_independent" :label-width="item.labelWidth" :label="item.label" :prop="item.field"
+            :rules="detail ? item.rules : {}" v-if="item.type === 'coord'">
+            <div class="forms_switch">
+              <el-input :placeholder="item.placeholder" :disabled="item.disabled" :id="item.field"
+                v-model="ruleForm[`${item.field}`]" auto-complete="new-password" @focus="coordFocus"></el-input>
+            </div>
+          </el-form-item>
           <!-- 开关 -->
           <el-form-item class="card_independent" :label-width="item.labelWidth" :label="item.label" :prop="item.field"
             :rules="detail ? item.rules : {}" v-if="item.type === 'switch'">
@@ -227,6 +235,30 @@
         </el-col>
       </el-row>
     </el-form>
+    <el-dialog width="900px" top="9vh" :visible.sync="innerVisible" :close-on-click-modal="false" show-close
+      append-to-body @opened="mapOpened">
+      <div class="card_search_box">
+        <div style="width: 50%;">
+          <el-input v-model="address" placeholder="请输入地址搜索" id="tipinputMap"></el-input>
+        </div>
+      </div>
+      <div class="card_coordMap">
+        <div id="container"></div>
+        <div class="close_map center_in el-icon-close" @click="innerVisible = false"></div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <div class="space_between_in">
+          <div class="card_coord">
+            <div class="coord_address">当前坐标:</div>
+            <div class="coord_address">地址:</div>
+          </div>
+          <div style="display: flex;align-items: center;">
+            <el-button @click="innerVisible = false">取 消</el-button>
+            <el-button type="primary" @click="innerVisible = false">确 定</el-button>
+          </div>
+        </div>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -321,6 +353,13 @@
         // 商品列表
         commodityList: [],
         loadedDrug: false,
+        innerVisible: false,
+        map: null,
+
+        address: '',
+        auto: null,
+        placeSearch: null,
+        lnglat: [],
       }
     },
     methods: {
@@ -580,12 +619,84 @@
           }
         })
         return flag
+      },
+      coordFocus() {
+        this.innerVisible = true
+
+      },
+      mapOpened() {
+        this.$nextTick(() => {
+          setTimeout(() => {
+            this.keyUpSearch()
+          }, 100)
+        })
+      },
+      keyUpSearch() {
+        var that = this
+        that.map = new AMap.Map("container", {
+          resizeEnable: true,
+          zoom: 3,
+        });
+        that.map.setFitView()
+        // 关键字查询
+        that.searchMap();
+        // 监听鼠标点击事件
+        that.map.on("click", that.clickMapHandler);
+
+      },
+      searchMap() {
+        var that = this
+        // 搜索框自动完成类
+        that.auto = new AMap.Autocomplete({
+          input: "tipinputMap", // 使用联想输入的input的id
+        });
+        //构造地点查询类
+        that.placeSearch = new AMap.PlaceSearch({
+          map: that.map,
+        });
+        // 当选中某条搜索记录时触发
+        that.auto.on("select", that.selectSite);
+      },
+      //选中查询出的记录
+      selectSite(e) {
+        console.log(e,669)
+        if (e.poi.location) {
+          // this.lnglat = [e.poi.location.lng, e.poi.location.lat];
+          this.placeSearch.setCity(e.poi.adcode);
+          this.placeSearch.search(e.poi.name); //关键字查询
+          let geocoder = new AMap.Geocoder({});
+          let that = this;
+          geocoder.getAddress(this.lnglat, function(status, result) {
+            if (status === "complete" && result.regeocode) {
+              that.province = result.regeocode.addressComponent.province;
+              that.city = result.regeocode.addressComponent.city;
+              //自己想要赋的值，根据自己的做修改
+              that.$set(that.form, "province", that.province);
+              that.$set(that.form, "city", that.city);
+              that.$set(that.form, "address", e.poi.name);
+              that.$set(
+                that.form,
+                "coordinate",
+                e.poi.location.lng + "," + e.poi.location.lat
+              ); //纬度，经度
+            } else {}
+          });
+        } else {
+          this.$message.error("查询地址失败，请重新输入地址");
+        }
+      },
+      clickMapHandler() {
+        console.log(23)
       }
     }
   }
 </script>
 
 <style lang="scss" scoped>
+  ::v-deep .el-form-item__label {
+    pointer-events: none !important;
+  }
+
   ::v-deep .el-cascader {
     width: 100% !important;
   }
@@ -724,6 +835,7 @@
 
   .forms_switch {
     height: 40px;
+    width: 100%;
   }
 
   .custom-width {
@@ -746,4 +858,49 @@
   ::v-deep .el-select__input {
     color: #ffffff;
   }
+
+  .card_search_box {
+    width: 100%;
+    border-bottom: 1px solid rgba(95, 99, 127, 0.8);
+    padding: 10px 20px;
+  }
+
+  .card_coordMap {
+    width: calc(100% - 40px);
+    height: 600px;
+    flex: 1;
+    padding: 20px;
+  }
+
+  #container {
+    position: relative;
+    width: 100%;
+    height: 100%;
+  }
+
+  .close_map {
+    cursor: pointer;
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    font-size: 25px;
+    width: 40px;
+    height: 40px;
+    background-color: rgba(245, 108, 108, .7);
+    box-shadow: 0 2px 4px rgba(245, 108, 108, .7);
+    border-radius: 50%;
+  }
+
+  .card_coord {
+    display: flex;
+    flex-direction: column;
+    background-color: rgba(103, 194, 58, .6);
+    padding: 4px 10px;
+    border-radius: 5px;
+  }
+
+  .coord_address {
+    font-size: 15px;
+    color: #ffffff;
+  }
 </style>

src/components/tables.vue

@@ -50,11 +50,11 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column :label="item.label" align="center" v-else-if="item.field == 'suitableForCold'">
+        <!-- <el-table-column :label="item.label" align="center" v-else-if="item.field == 'suitableForCold'">
           <template slot-scope="scope" v-if="item.field == 'suitableForCold'">
             <div v-if="scope.row[item.field]">{{ scope.row[item.field] }} ℃</div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column :label="item.label" align="center" v-else-if="item.field == 'iceTime'">
           <template slot-scope="scope" v-if="item.field == 'iceTime'">
             <div>{{ geticeTime(scope.row) }}</div>
@@ -75,12 +75,16 @@
             <el-table-column :prop="child.field" :label="child.label" :width="child.colWidth" :align="child.align">
               <template slot-scope="scope">
                 <div v-if="child.field == 'suitableForColdTime'">≥{{scope.row[child.field]}}min</div>
-                <div
-                  v-else-if="child.field == 'iceRaftRecord.suitableForCold' && scope.row.iceRaftRecord.suitableForCold">
-                  {{nestedField(scope.row,child.field)}}℃
-                </div>
                 <div v-else-if="child.field == 'suitableForCold'">
+                  <div v-if="scope.row.iceRaftRecord">{{scope.row.iceRaftRecord[child.field]}}℃</div>
+                  <div v-else>{{scope.row[child.field]}}℃</div>
+                </div>
+                <!-- <div v-else-if="child.field == 'suitableForCold'">
                   {{scope.row.suitableForCold ? scope.row.suitableForCold + '℃' : ''}}
+                </div> -->
+                <div v-else-if="child.field == 'forColdTimeActual'">
+                  <div v-if="scope.row.iceRaftRecord">{{ formatMinutes(scope.row.iceRaftRecord[child.field]) }}</div>
+                  <div v-else>{{ formatMinutes(scope.row[child.field]) }}</div>
                 </div>
                 <div v-else>{{nestedField(scope.row,child.field) || ''}}</div>
               </template>
@@ -140,14 +144,19 @@
           v-else-if="item.field == 'location'">
           <template slot-scope="scope">
             <div v-if="scope.row.iceRaftRecord">
-              <div v-if="scope.row.iceRaftRecord.outStorageTime == ''">{{scope.row.iceRaftRecord.iceLocker.name}}</div>
-              <div v-else>{{scope.row.iceRaftRecord.coolerBox.name}}
+              <div v-if="['1','2','5','6'].includes(scope.row.iceRaftRecord.status)">
+                {{scope.row.iceRaftRecord.iceLocker.name}}
               </div>
+              <div v-else>{{scope.row.iceRaftRecord.coolerBox.name}}</div>
+              <!-- <div v-if="scope.row.iceRaftRecord.outStorageTime == ''">{{scope.row.iceRaftRecord.iceLocker.name}}</div>
+              <div v-else>{{scope.row.iceRaftRecord.coolerBox.name}}
+              </div> -->
             </div>
             <div v-else>
-              <div v-if="scope.row.outStorageTime == ''">{{scope.row.iceLocker.name}}</div>
-              <div v-else>{{scope.row.coolerBox.name}}
-              </div>
+              <div v-if="['1','2','5','6'].includes(scope.row.status)">{{scope.row.iceLocker.name}}</div>
+              <div v-else>{{scope.row.coolerBox.name}}</div>
+              <!-- <div v-if="scope.row.outStorageTime == ''">{{scope.row.iceLocker.name}}</div>
+              <div v-else>{{scope.row.coolerBox.name}}</div> -->
             </div>
           </template>
         </el-table-column>
@@ -163,8 +172,8 @@
         <el-table-column :prop="item.field" :label="item.label" :width="item.colWidth" :align="item.align"
           v-else-if="item.field == 'freezeDuration'">
           <template slot-scope="scope">
-            <div v-if="scope.row.iceRaftRecord">{{ formatMinutes(scope.row.iceRaftRecord.freezeDuration) }}</div>
-            <div v-else>{{ formatMinutes(scope.row.freezeDuration) }}</div>
+            <div v-if="scope.row.iceRaftRecord">{{ formatMinutes(scope.row.iceRaftRecord[item.field]) }}</div>
+            <div v-else>{{ formatMinutes(scope.row[item.field]) }}</div>
           </template>
         </el-table-column>
         <el-table-column :prop="item.field" :label="item.label" :width="item.colWidth" :align="item.align"
@@ -277,7 +286,20 @@
     },
     methods: {
       geticeTime(event) {
-        let specificDateTime = event.iceRaftRecord.ice_use_time
+        let specificDateTime = ''
+        if (event.returnDate) {
+          specificDateTime = event.returnDate
+        } else {
+          if (event.iceRaftRecord) {
+            if (event.iceRaftRecord.returnDate) {
+              specificDateTime = event.iceRaftRecord.returnDate
+            } else {
+              specificDateTime = event.iceRaftRecord.ice_use_time
+            }
+          } else {
+            specificDateTime = event.ice_use_time
+          }
+        }
         const specificDate = new Date(specificDateTime);
         // 获取当前时间
         const now = new Date();
@@ -294,6 +316,28 @@
         return time
         // console.log(`使用时间差: ${hours}小时 ${minutes}分钟 ${seconds}秒`);
       },
+      geticeTimeil(event) {
+        let specificDateTime = ''
+        if (event.iceRaftRecord) {
+          specificDateTime = event.iceRaftRecord.start_ice_cold_time
+        } else {
+          specificDateTime = event.start_ice_cold_time
+        }
+        const specificDate = new Date(specificDateTime);
+        // 获取当前时间
+        const now = new Date();
+        // 计算时间差，得到毫秒数
+        const timeDifference = now - specificDate;
+        // 将时间差转换为小时、分钟和秒
+        const hours = Math.floor(timeDifference / 3600000);
+        const minutes = Math.floor((timeDifference % 3600000) / 60000);
+        const seconds = Math.floor((timeDifference % 60000) / 1000);
+        let time = ''
+        if (minutes) {
+          time = hours + 'h' + minutes + 'm'
+        }
+        return time
+      },
       getImage(image) {
         let arr = []
         arr.push(image)

src/main.js

@@ -27,7 +27,8 @@ Vue.prototype.$echarts = echarts;
 VueAMap.initAMapApiLoader({
   key: '313da1394834ef78b8ed910155f9a486',
   plugin: ['AMap.Geocoder', 'AMap.GraspRoad', 'AMap.ReverseGeocode', 'AMap.Geolocation',
-  'AMap.TrackBack'], // 添加您需要的插件
+    'AMap.TrackBack', 'AMap.AutoComplete', 'AMap.PlaceSearch'
+  ], // 添加您需要的插件
 });
 
 window._AMapSecurityConfig = {

src/views/IceCreamFreezer/FreezerManagement.vue

@@ -68,7 +68,7 @@
         <tables ref="refIce" :tableList="freezerIceList" :tableData="freezerIceData"></tables>
         <!-- 分页 -->
         <div class="card_ice_bottom" v-if="icePagination.Total">
-          <pagination :total="icePagination.Total" :currentPage="icePagination.PageIndex" :pager-countnum="5"
+          <pagination :total="icePagination.Total" :currentPage="icePagination.PageSize" :pager-countnum="5"
             layout="total, sizes, prev, pager, next" @changeSize="iceSize" @changeCurrent="iceCurrent">
           </pagination>
           <div style="display: flex;align-items: center;">
@@ -236,8 +236,8 @@
         freezerIceData: [],
         icePagination: {
           Total: 0,
-          PageIndex: 1,
-          PageSize: 10,
+          PageIndex: 10,
+          PageSize: 1,
         },
         iceLoading: false,
       }
@@ -375,8 +375,8 @@
       // 获取冷冻柜下的冰排列表
       getIceData() {
         getIcelockerData({
-          page: this.icePagination.PageIndex,
-          pageSize: this.icePagination.PageSize,
+          page: this.icePagination.PageSize,
+          pageSize: this.icePagination.PageIndex,
         }).then(res => {
           if (res.code == 200) {
             this.freezerIceData = res.data.list
@@ -527,11 +527,11 @@
         this.getDeviceList()
       },
       // 冷冻柜冰排列表
-      iceSize() {
+      iceSize(val) {
         this.icePagination.PageIndex = val
         this.getIceData()
       },
-      iceCurrent() {
+      iceCurrent(val) {
         this.icePagination.PageSize = val
         this.getIceData()
       },

src/views/IceCreamFreezer/IceManagement.vue

@@ -32,7 +32,8 @@
     addIceRaft,
     putIceRaft,
     delIceRaft,
-    bindCoolerBox
+    bindCoolerBox,
+    UnbindCoolerBox
   } from '@/api/freezer'
   import {
     getCoolerBox
@@ -104,7 +105,7 @@
           freezeClaim: [],
           coolerBoxId: [],
           label: '',
-          suitableForCold: null,
+          suitableForCold: '',
           forColdTime: null,
           iceColdAddress: '',
           sort: null,
@@ -153,6 +154,12 @@
         getIceRaft(params).then(res => {
           if (res.code == 200) {
             this.tableData = res.data.list
+            this.tableData.forEach(item => {
+              if (item.coolerBoxName) {
+                item.coolerBoxData = item.coolerBoxName
+                item.coolerBoxName = item.coolerBoxName.join(',')
+              }
+            })
             this.Total = res.data.count
           }
         })
@@ -179,7 +186,7 @@
               status: this.ruleForm.status,
               freezeClaim: turnNum(this.ruleForm.freezeClaim),
               label: this.ruleForm.label,
-              suitableForCold: Number(this.ruleForm.suitableForCold),
+              suitableForCold: this.ruleForm.suitableForCold,
               forColdTime: Number(this.ruleForm.forColdTime),
               iceColdAddress: this.ruleForm.iceColdAddress,
               sort: Number(this.ruleForm.sort),
@@ -205,7 +212,7 @@
               status: this.ruleForm.status,
               freezeClaim: turnNum(this.ruleForm.freezeClaim),
               label: this.ruleForm.label,
-              suitableForCold: Number(this.ruleForm.suitableForCold),
+              suitableForCold: this.ruleForm.suitableForCold,
               forColdTime: Number(this.ruleForm.forColdTime),
               iceColdAddress: this.ruleForm.iceColdAddress,
               sort: Number(this.ruleForm.sort),
@@ -224,9 +231,11 @@
               this.confirmLoading = false
             })
           } else if (this.operationType == 'binding') {
+            this.confirmLoading = true
+            var arrBoxId = this.ruleForm.coolerBoxId.map(Number)
             var params = {
               code: this.iceCode,
-              coolerBoxId: Number(this.ruleForm.coolerBoxId),
+              coolerBoxId: arrBoxId,
             }
             bindCoolerBox(params).then(res => {
               if (res.code == 200) {
@@ -241,6 +250,25 @@
             }).catch(() => {
               this.confirmLoading = false
             })
+          } else if (this.operationType == 'unbind') {
+            this.confirmLoading = true
+            var arrBoxId = this.ruleForm.coolerBoxId.map(Number)
+            UnbindCoolerBox({
+              code: this.selectingData.code,
+              coolerBoxId: arrBoxId,
+            }).then(res => {
+              if (res.code == 200) {
+                this.$message({
+                  message: res.msg || '操作成功',
+                  type: 'success'
+                });
+                this.getList()
+                this.staffDialogVisible = false
+              }
+              this.confirmLoading = false
+            }).catch(() => {
+              this.confirmLoading = false
+            })
           }
         } else {
           this.$message.error('表单信息不完整，请继续填写完整');
@@ -288,6 +316,31 @@
           })
         } else if (type == 'del') {
           this.deleteUser(row.id)
+        } else if (type == 'unbind') {
+          let coolerID = []
+          if (row.bindCoolerBox) {
+            this.ruleForm.coolerBoxId = row.bindCoolerBox.map(String)
+            coolerID = zipToObjects(row.bindCoolerBox, row.coolerBoxData)
+
+            function zipToObjects(keys, values) {
+              return keys.map((key, index) => ({
+                label: values[index],
+                value: key
+              }));
+            }
+          }
+          this.staffDialogVisible = true
+          this.staffTitle = '修改绑定保温箱'
+          this.formRuleList = bindingIncubator()
+          this.formRuleList.forEach(item => {
+            if (item.type == 'searchSelect') {
+              item.options = coolerID
+            }
+          })
+          this.page = 1
+          this.limitNoil = true
+          this.getIncubator()
+          // this.remoteMethod()
         }
       },
       openModel(type) {
@@ -313,7 +366,7 @@
             this.staffDialogVisible = true
             this.staffTitle = '绑定保温箱'
             this.formRuleList = bindingIncubator()
-            this.getIncubator()
+            this.remoteMethod()
           } else {
             this.$message({
               message: '请先选择需要批量操作的冰排',
@@ -362,7 +415,24 @@
             if (this.limitNoil == true) {
               this.formRuleList.forEach(item => {
                 if (item.type == 'searchSelect') {
-                  item.options = item.options.concat(arrList)
+                  let arrIce = item.options.concat(arrList)
+                  const uniqueObjectsArray = uniqueObjectArray(arrIce);
+                  item.options = uniqueObjectsArray
+
+                  function uniqueObjectArray(arr) {
+                    const uniqueArray = [];
+                    const uniqueSet = new Set();
+
+                    for (const item of arr) {
+                      const uniqueId = JSON.stringify(item);
+                      if (!uniqueSet.has(uniqueId)) {
+                        uniqueSet.add(uniqueId);
+                        uniqueArray.push(item);
+                      }
+                    }
+
+                    return uniqueArray;
+                  }
                 }
               })
               // this.thermostat.options = this.thermostat.options.concat(arrList)

src/views/IceCreamFreezer/IceTracingManagement.vue

@@ -119,6 +119,9 @@
   import pagination from '@/components/pagination'
   import forms from '@/components/forms'
   import {
+    frozenState
+  } from '@/assets/js/blockSort'
+  import {
     employee,
     historyRecord,
     iceRaftRules,
@@ -157,27 +160,7 @@
           label: '状态',
           field: 'status',
           placeholder: '请选择状态',
-          options: [{
-            bgcolor: '#606266',
-            label: '未入库',
-            value: '0',
-          }, {
-            bgcolor: '#409EFF',
-            label: '冷冻中',
-            value: '1',
-          }, {
-            bgcolor: '#67C23A',
-            label: '待使用',
-            value: '2',
-          }, {
-            bgcolor: '#E6A23C',
-            label: '使用中',
-            value: '3',
-          }, {
-            bgcolor: '#909399',
-            label: '已结束',
-            value: '4',
-          }]
+          options: frozenState()
         }, {
           type: 'select',
           label: '冷冻柜',
@@ -193,7 +176,7 @@
         }],
         searchRuleForm: {
           code: '',
-          status: '',
+          status: null,
           iceLockerId: null,
           coolerBoxId: null,
         },

src/views/IceCreamFreezer/freezer.js

@@ -75,7 +75,7 @@ export const employeeCold = () => {
     align: 'center',
   }, {
     field: 'suitableForCold',
-    label: '释冷温度',
+    label: '释冷温度℃',
     align: 'center',
   }, {
     field: 'forColdTime',
@@ -92,9 +92,14 @@ export const employeeCold = () => {
   }, {
     field: 'action',
     label: '操作',
-    colWidth: '260px',
+    colWidth: '300px',
     align: 'center',
     labelButton: [{
+      type: 'unbind',
+      label: '修改绑定',
+      icon: 'el-icon-edit',
+      style: 'warning',
+    },{
       type: 'logs',
       label: '详情',
       icon: 'el-icon-tickets',
@@ -321,7 +326,8 @@ export const bindingIncubator = () => {
     placeholder: '请选择保温箱',
     type: 'searchSelect',
     colWidth: 24,
-    // createEntry: true,
+    multiple: true,
+    createEntry: true,
     options: [],
     rules: [{
       required: true,

src/views/IceCreamFreezer/iceRaft.js

@@ -43,7 +43,7 @@ export const employee = () => {
       label: '开始时间',
       align: 'center',
     }, {
-      field: 'iceRaftRecord.coolingTime',
+      field: 'forColdTimeActual',
       label: '释冷时间',
       align: 'center',
     }, {
@@ -68,10 +68,6 @@ export const employee = () => {
     label: '使用时间',
     align: 'center',
   }, {
-    field: 'iceRaftRecord.returnDate',
-    label: '归还时间',
-    align: 'center',
-  }, {
     field: 'iceRaftRecord.ice_use_users',
     label: '使用人员',
     align: 'center',
@@ -123,10 +119,10 @@ export const usageEmployee = () => {
     label: '冰排释冷',
     children: [{
       field: 'start_ice_cold_time',
-      label: '释冷日期',
+      label: '开始时间',
       align: 'center',
     }, {
-      field: 'coolingTime',
+      field: 'forColdTimeActual',
       label: '释冷时间',
       align: 'center',
     }, {
@@ -151,6 +147,10 @@ export const usageEmployee = () => {
     label: '使用时间',
     align: 'center',
   }, {
+    field: 'returnDate',
+    label: '归还时间',
+    align: 'center',
+  }, {
     field: 'ice_use_users',
     label: '使用人员',
     align: 'center',
@@ -191,10 +191,10 @@ export const historyRecord = () => {
     label: '冰排释冷',
     children: [{
       field: 'start_ice_cold_time',
-      label: '释冷日期',
+      label: '开始时间',
       align: 'center',
     }, {
-      field: 'coolingTime',
+      field: 'forColdTimeActual',
       label: '释冷时间',
       align: 'center',
     }, {

src/views/IceCreamFreezer/refrigerator.js

@@ -31,13 +31,21 @@ export const iceList = () => {
     label: '状态',
     align: 'center',
     options: [{
-      bgcolor: '#fa3534',
+      bgcolor: '#2979ff',
       label: '冷冻中',
       value: '1',
     }, {
-      bgcolor: '#67C23A',
+      bgcolor: '#19be6b',
       label: '待使用',
       value: '2',
+    }, {
+      bgcolor: '#ff9900',
+      label: '释冷中',
+      value: '5',
+    }, {
+      bgcolor: '#67C23A',
+      label: '释冷完成',
+      value: '6',
     }]
   }, {
     field: 'freezeClaim',

src/views/IceCreamFreezer/store.js

@@ -11,7 +11,15 @@ export const employee = () => {
     label: '门店名称',
     align: 'center',
   }, {
-    field: 'address',
+    field: 'appName',
+    label: 'APP公司名称',
+    align: 'center',
+  }, {
+    field: 'companyCoordinate',
+    label: '公司坐标',
+    align: 'center',
+  }, {
+    field: 'companyAddress',
     label: '门店详细地址',
     align: 'center',
   }, {
@@ -55,7 +63,29 @@ export const formRules = () => {
       trigger: 'blur'
     }]
   }, {
-    field: 'address',
+    field: 'appName',
+    label: 'app公司名称',
+    placeholder: '请输入app公司名称',
+    type: 'input',
+    colWidth: 24,
+    rules: [{
+      required: false,
+      message: '请输入app公司名称',
+      trigger: 'blur'
+    }]
+  }, {
+    field: 'companyCoordinate',
+    label: '公司坐标',
+    placeholder: '请输入公司坐标',
+    type: 'coord',
+    colWidth: 24,
+    rules: [{
+      required: true,
+      message: '请输入公司坐标',
+      trigger: 'blur'
+    }]
+  }, {
+    field: 'companyAddress',
     label: '门店详细地址',
     placeholder: '请输入门店详细地址',
     type: 'input',

src/views/IceCreamFreezer/storeManagement.vue

@@ -82,7 +82,7 @@
           name: '',
           remark: '',
           coldKey: '',
-          address: '',
+          companyAddress: '',
         },
         confirmLoading: false,
         selectingData: {},
@@ -132,8 +132,8 @@
                   type: 'success'
                 });
                 this.getList()
+                this.staffDialogVisible = false
               }
-              this.staffDialogVisible = false
               this.confirmLoading = false
             }).catch(() => {
               this.confirmLoading = false
@@ -145,7 +145,7 @@
               name: this.ruleForm.name,
               remark: this.ruleForm.remark,
               coldKey: this.ruleForm.coldKey,
-              address: this.ruleForm.address,
+              companyAddress: this.ruleForm.companyAddress,
             }
             putCompany(params).then(res => {
               if (res.code == 200) {
@@ -154,8 +154,8 @@
                   type: 'success'
                 });
                 this.getList()
+                this.staffDialogVisible = false
               }
-              this.staffDialogVisible = false
               this.confirmLoading = false
             }).catch(() => {
               this.confirmLoading = false
@@ -177,7 +177,7 @@
             this.$nextTick(() => {
               this.ruleForm.name = row.name
               this.ruleForm.remark = row.remark
-              this.ruleForm.address = row.address
+              this.ruleForm.companyAddress = row.companyAddress
               this.ruleForm.coldKey = row.coldKey
             })
           })

src/views/incubator/retrospect.js

@@ -1,3 +1,6 @@
+import {
+  usageStatus,
+} from '@/assets/js/blockSort'
 export const employee = () => {
   return [{
     field: 'index',
@@ -12,6 +15,11 @@ export const employee = () => {
     label: 'SN',
     align: 'center',
   }, {
+    field: 'status',
+    label: '状态',
+    align: 'center',
+    options: usageStatus()
+  }, {
     field: 'coolerBoxStarTime',
     label: '预冷放入时间',
     align: 'center',
@@ -48,7 +56,7 @@ export const employee = () => {
     label: '放置冰排数量',
     align: 'center',
   }, {
-    field: 'coolerBoxUserTime',
+    field: 'coolerEndUseTime',
     label: '归还时间',
     align: 'center',
   }, {

src/views/system/company.js

@@ -11,6 +11,10 @@ export const employee = () => {
       label: 'APP公司名称',
       align: 'center',
     }, {
+      field: 'companyCoordinate',
+      label: '公司坐标',
+      align: 'center',
+    }, {
       field: 'companyAddress',
       label: '地址',
       align: 'center',
@@ -74,7 +78,7 @@ export const employee = () => {
     }, {
       field: 'action',
       label: '操作',
-      colWidth: '330px',
+      colWidth: '300px',
       align: 'center',
       labelButton: [{
         type: 'subAdd',
@@ -120,6 +124,17 @@ export const formRules = () => {
       trigger: 'blur'
     }]
   }, {
+    field: 'companyCoordinate',
+    label: '公司坐标',
+    placeholder: '请输入公司坐标',
+    type: 'coord',
+    colWidth: 24,
+    rules: [{
+      required: true,
+      message: '请输入公司坐标',
+      trigger: 'blur'
+    }]
+  }, {
     field: 'companyAddress',
     label: '地址',
     placeholder: '请输入地址',

src/views/system/interiorUserManagement.vue

@@ -133,6 +133,7 @@
       },
       // 点击公司获取用户列表
       handleNodeClick(data) {
+        this.Pagination.PageIndex = 1
         this.companyId = data.id
         this.getList()
       },