add 项目更新

nladmin-ui/public/config.js

@@ -3,7 +3,7 @@ window.g = {
     VUE_APP_BASE_API: 'http://127.0.0.1:8011'
   },
   prod: {
-    VUE_APP_BASE_API: 'http://127.0.0.1:8011'
+    VUE_APP_BASE_API: 'http://10.62.3.156:8011'
   }
 
 }

nladmin-ui/src/views/wms/basedata/group/index.vue

@@ -159,7 +159,7 @@
         <el-table-column prop="create_name" label="组盘人" :min-width="flexWidth('create_name',crud.data,'组盘人')" />
         <el-table-column prop="create_time" label="组盘时间" :min-width="flexWidth('create_time',crud.data,'组盘时间')" />
         <el-table-column
-          v-permission="['admin','Supplierbase:edit','Supplierbase:del']"
+          v-permission="['admin','Group:edit','Group:del']"
           label="操作"
           width="150px"
           lign="center"
@@ -168,7 +168,7 @@
             <udOperation
               :data="scope.row"
               :is-visiable-edit="false"
-              :disabled-dle="scope.row.status === '02'"
+              :disabled-dle="scope.row.status === '08'"
               :permission="permission"
             />
           </template>
@@ -225,6 +225,7 @@ export default {
       url: 'api/group',
       optShow: {
         add: true,
+        del: false,
         reset: true
       },
       idField: 'group_id',

nladmin-ui/src/views/wms/sch/point/index.vue

@@ -87,7 +87,7 @@
           </el-form-item>
           <el-form-item label="锁定类型">
             <el-switch
-              v-model="query.lock_type"
+              v-model="query.lock_up"
               :active-value="true"
               :inactive-value="false"
               active-color="#409EFF"
@@ -122,6 +122,16 @@
         >
           启用
         </el-button>
+<!--        <el-button-->
+<!--          slot="right"-->
+<!--          class="filter-item"-->
+<!--          size="mini"-->
+<!--          type="warning"-->
+<!--          icon="el-icon-circle-close"-->
+<!--          :loading="downloadLoading"-->
+<!--          @click="doExport1"-->
+<!--        >一键解锁出库点-->
+<!--        </el-button>-->
         <el-button
           v-if="crud.query.is_used == 'true'"
           slot="right"
@@ -135,7 +145,7 @@
           禁用
         </el-button>
         <el-button
-          v-if="!crud.query.lock_type"
+          v-if="!crud.query.lock_up"
           slot="right"
           class="filter-item"
           size="mini"
@@ -147,7 +157,7 @@
           锁定
         </el-button>
         <el-button
-          v-if="crud.query.lock_type"
+          v-if="crud.query.lock_up"
           slot="right"
           class="filter-item"
           size="mini"
@@ -258,6 +268,7 @@
           <el-form-item label="载具数量" prop="vehicle_qty">
             <el-input-number style="width: 370px;" :controls="false" class="clear-number-input" v-model="form.vehicle_qty" :min="0" :precision="0" :max="99999" label="载具数量" size="mini" />
           </el-form-item>
+
           <el-form-item label="是否有工单">
             <el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_has_workder" :label="item.value">{{ item.label }}</el-radio>
           </el-form-item>
@@ -402,6 +413,7 @@ const defaultForm = {
   is_auto: 'true',
   remark: null,
   is_used: 'true',
+  lock_up: 'false',
   can_vehicle_types: null
 }
 export default {
@@ -425,7 +437,7 @@ export default {
       },
       query: {
         is_used: 'true',
-        lock_type: false
+        lock_up: 'false'
       }
     })
   },
@@ -454,7 +466,8 @@ export default {
       pointStatusList: [],
       pointStatusDialogList: [],
       pointTypesDialogList: [],
-      pointDialog: false
+      pointDialog: false,
+      downloadLoading: false
     }
   },
   created() {
@@ -544,7 +557,7 @@ export default {
     changeLock(data) {
       const param = {}
       param.data = data
-      param.lock_type = this.crud.query.lock_type
+      param.lock_up = !this.crud.query.lock_up
       crudSchBasePoint.changeLock(param).then(res => {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()