From ab2bc450bb4b7eef7ccd64c68c31dbd5e2430a79 Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Tue, 12 Jul 2022 10:26:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=91=97=E5=BD=95=E7=95=8C=E9=9D=A2=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E9=A2=84=E8=A7=88=E5=AE=BD=E5=BA=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/storeManage/deviceManage/device.js     |  8 ++++----
 .../category/descriptionPreview/index.vue      |  6 +++---
 src/views/components/category/SettingForm.vue  |  6 +++---
 .../deviceManage/module/deviceDetail.vue       | 18 ++++++++++++++----
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/api/storeManage/deviceManage/device.js b/src/api/storeManage/deviceManage/device.js
index a968a00..cb6ad3f 100644
--- a/src/api/storeManage/deviceManage/device.js
+++ b/src/api/storeManage/deviceManage/device.js
@@ -9,7 +9,7 @@ export function getSupplier() {
 
 export function add(data) {
   return request({
-    url: 'api/dictrionary/edit',
+    url: 'api/desecabinet/create',
     method: 'post',
     data
   })
@@ -20,7 +20,7 @@ export function del(ids) {
     id: ids[0]
   }
   return request({
-    url: 'api/dictrionary/delete',
+    url: 'api/desecabinet/delete',
     method: 'post',
     data
   })
@@ -28,8 +28,8 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/dictrionary/edit',
-    method: 'post',
+    url: 'api/desecabinet/edit',
+    method: 'put',
     data
   })
 }
diff --git a/src/views/category/descriptionPreview/index.vue b/src/views/category/descriptionPreview/index.vue
index c4b97d8..8ba5b1e 100644
--- a/src/views/category/descriptionPreview/index.vue
+++ b/src/views/category/descriptionPreview/index.vue
@@ -244,7 +244,7 @@ export default {
     margin-bottom: 30px;
     margin-left: 1px;
     li {
-      width: 100px;
+      width: 116px;
       height: 40px;
       line-height: 40px;
       margin: -1px 0 0 -1px;
@@ -263,7 +263,7 @@ export default {
       &:hover,
       &.fields-active {
         color: #fff;
-        background-color: #339CFF;
+        background-color: #339cff;
       }
     }
   }
@@ -283,7 +283,7 @@ export default {
   }
 
   .des-preview-right {
-    width: 658px;
+    width: 690px;
     margin-left: 20px;
   }
   .edit-form-dialog {
diff --git a/src/views/components/category/SettingForm.vue b/src/views/components/category/SettingForm.vue
index a8c0afe..602a1dc 100644
--- a/src/views/components/category/SettingForm.vue
+++ b/src/views/components/category/SettingForm.vue
@@ -2,7 +2,7 @@
   <div class="des-form">
     <el-row :gutter="10">
       <el-form ref="form" :model="form" :rules="rules" :hide-required-asterisk="isDisabled" size="small" label-width="80px">
-        <el-col :span="15">
+        <el-col :span="16">
           <el-form-item v-if="!isDisabled" label="中文名称" prop="fieldCnName">
             <el-input v-model="form.fieldCnName" :disabled="isDisabled" />
           </el-form-item>
@@ -46,7 +46,7 @@
             <el-input v-model="form.isDefaultValue" :readonly="isDisabled" />
           </el-form-item>
         </el-col>
-        <el-col :span="9">
+        <el-col :span="8">
           <el-form-item class="checkbox-item">
             <span>显示一整行</span>
             <el-checkbox v-model="form.isLine" name="isLine" :disabled="isDisabled" @change="changeIsLine" />
@@ -398,7 +398,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .des-form {
-  width: 496px;
+  width: 464px;
   padding: 20px 38px 20px 20px;
   margin-top: 30px;
   border-radius: 4px;
diff --git a/src/views/storeManage/deviceManage/module/deviceDetail.vue b/src/views/storeManage/deviceManage/module/deviceDetail.vue
index 48a36dd..b469a5b 100644
--- a/src/views/storeManage/deviceManage/module/deviceDetail.vue
+++ b/src/views/storeManage/deviceManage/module/deviceDetail.vue
@@ -7,7 +7,7 @@
           <el-button v-permission="permission.add" size="mini" type="primary" icon="el-icon-plus" :disabled="!activeAddBtn" @click="selectDeviceType">新增</el-button>
         </template>
         <template v-slot:right>
-          <el-button v-permission="permission.del" icon="el-icon-delete" size="mini" :loading="crud.delAllLoading" :disabled="crud.selections.length === 0" @click="toDelete(crud.selections)">删除</el-button>
+          <el-button v-permission="permission.del" icon="el-icon-delete" size="mini" :loading="crud.delAllLoading" :disabled="crud.selections && crud.selections.length === 0" @click="toDelete(crud.selections)">删除</el-button>
         </template>
       </crudOperation>
     </div>
@@ -58,10 +58,20 @@
               <el-checkbox label="4">出库</el-checkbox>
             </el-checkbox-group>
           </el-form-item>
+          <el-form-item label="回调确认" prop="isCallback">
+            <el-checkbox-group v-model="form.isCallback">
+              <el-checkbox label="1">借出</el-checkbox>
+              <el-checkbox label="2">归还</el-checkbox>
+              <el-checkbox label="3">入库</el-checkbox>
+              <el-checkbox label="4">出库</el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+          <el-form-item label="下发通知" prop="isNotice" style="display: block;">
+            <el-checkbox v-model="form.isNotice">通知</el-checkbox>
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
         </div>
       </div>
     </el-dialog>
@@ -125,7 +135,7 @@ import CRUD, { presenter, header, form } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 
-const defaultForm = { deviceInfo: { supplierId: null }, id: null, supplierId: null, dicExplain: null, dicType: false }
+const defaultForm = { deviceInfo: { supplierId: null }, id: null, isLinkage: [], isCallback: [], isNotice: [] }
 
 export default {
   components: { crudOperation, pagination },