From 6a5b7abb1f3b94de39bf4c373da6e77b5fa98d0f Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Tue, 21 Jun 2022 17:30:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E7=B1=BB=E7=AE=A1=E7=90=86=20bug?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E6=A1=A3=E6=A1=88=E7=9B=92=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/archivesManage/caseManage.js          | 35 ++++++------
 src/api/category/listBrowsing.js              | 18 +++++-
 src/api/category/orderingRule.js              | 26 +++++++++
 src/views/archivesManage/caseManage/index.vue | 54 ++++++++++++------
 .../archivesManage/caseManage/module/form.vue | 57 ++++++++++---------
 src/views/category/index.vue                  |  6 +-
 src/views/category/listBrowsing/index.vue     |  8 +--
 .../category/listBrowsing/module/form.vue     | 30 +++++++---
 .../listBrowsing/module/sortDialog.vue        |  6 +-
 src/views/category/orderingRule/index.vue     |  8 +--
 .../category/orderingRule/module/form.vue     |  2 +-
 .../orderingRule/module/sortDialog.vue        |  6 +-
 12 files changed, 169 insertions(+), 87 deletions(-)
 create mode 100644 src/api/category/orderingRule.js

diff --git a/src/api/archivesManage/caseManage.js b/src/api/archivesManage/caseManage.js
index 27da461..4bbf37a 100644
--- a/src/api/archivesManage/caseManage.js
+++ b/src/api/archivesManage/caseManage.js
@@ -1,20 +1,4 @@
 import request from '@/utils/request'
-import qs from 'qs'
-// import { form } from '../../components/Crud/crud'
-
-export function getTableDisplayFields(params) {
-  return request({
-    url: 'api/archives/initArchivesViewTable' + '?' + qs.stringify(params, { indices: false }),
-    method: 'get'
-  })
-}
-
-export function getFormDisplayFields(params) {
-  return request({
-    url: 'api/archives/doedit' + '?' + qs.stringify(params, { indices: false }),
-    method: 'get'
-  })
-}
 
 export function add(form) {
   return edit(form)
@@ -36,4 +20,21 @@ export function del(parameter) {
   })
 }
 
-export default { add, edit, del, getTableDisplayFields, getFormDisplayFields }
+// 判断盒名称是否重复
+export function caseNameIsRepeat(parameter) {
+  return request({
+    url: 'api/case/caseNameIsRepeat',
+    method: 'get',
+    params: parameter
+  })
+}
+// 判断条形码值是否重复
+export function barcodeIsRepeat(parameter) {
+  return request({
+    url: 'api/case/barcodeIsRepeat',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export default { add, edit, del }
diff --git a/src/api/category/listBrowsing.js b/src/api/category/listBrowsing.js
index 2f3cf8f..5c8c531 100644
--- a/src/api/category/listBrowsing.js
+++ b/src/api/category/listBrowsing.js
@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+export function add(data) {
+  return request({
+    url: 'api/arc-list/create',
+    method: 'post',
+    data
+  })
+}
+
 export function edit(data) {
   return request({
     url: 'api/arc-display/state',
@@ -8,4 +16,12 @@ export function edit(data) {
   })
 }
 
-export default { edit }
+export function order(data) {
+  return request({
+    url: 'api/arc-list/display-order',
+    method: 'put',
+    data
+  })
+}
+
+export default { add }
diff --git a/src/api/category/orderingRule.js b/src/api/category/orderingRule.js
new file mode 100644
index 0000000..8d6a8e4
--- /dev/null
+++ b/src/api/category/orderingRule.js
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+export function getDisplayField(params) {
+  return request({
+    url: 'api/arc-dic/is-display',
+    method: 'get',
+    params
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/arc-list-sort/orderby',
+    method: 'put',
+    data
+  })
+}
+
+export function order(data) {
+  return request({
+    url: 'api/arc-list-sort/update-queue',
+    method: 'put',
+    data
+  })
+}
+export default { edit }
diff --git a/src/views/archivesManage/caseManage/index.vue b/src/views/archivesManage/caseManage/index.vue
index aac728c..398c878 100644
--- a/src/views/archivesManage/caseManage/index.vue
+++ b/src/views/archivesManage/caseManage/index.vue
@@ -4,7 +4,21 @@
     <div class="head-container">
       <crudOperation :permission="permission">
         <template v-slot:right>
-          <el-button icon="el-icon-delete" size="mini">导出</el-button>
+          <!-- 搜索 v-model="query.enabled"
+          <el-select clearable size="small" placeholder="状态" class="filter-item" style="width: 100px" @change="crud.toQuery">
+            <i slot="prefix" class="iconfont icon-zhuangtai-fanbai" />
+            <el-option v-for="item in stateOptions" :key="item.key" :label="item.label" :value="item.key" />
+          </el-select>-->
+          <!-- <el-input v-model="query[inputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 200px;" class="input-prepend filter-item" @keyup.enter.native="crud.toQuery">
+            <el-select slot="prepend" v-model="inputSelect" style="width: 80px" @change="querySelect">
+              <el-option
+                v-for="item in queryOption"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-input> -->
         </template>
         <template v-slot:rightButtonGroup>
           <div class="archives-handler-btn">
@@ -18,9 +32,10 @@
       <span class="right-top-line" />
       <span class="left-bottom-line" />
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" height="calc(100vh - 463px)" @selection-change="selectionChangeHandler" @row-click="clickRowHandler">
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" height="calc(100vh - 463px)" @selection-change="crud.selectionChangeHandler" @row-click="clickRowHandler">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column prop="depositNum" label="入库" align="center" />
         <el-table-column prop="depositNum" label="已装" align="center" />
         <el-table-column prop="caseName" label="盒名称" align="center" />
         <el-table-column prop="tid" label="TID" align="center" />
@@ -76,7 +91,25 @@ export default {
         edit: ['admin', 'caseManage:edit'],
         del: ['admin', 'caseManage:del']
       },
-      verifyDialVisible: false
+      verifyDialVisible: false,
+      stateOptions: [
+        {
+          label: '全部',
+          value: 'center'
+        },
+        {
+          label: '未入',
+          value: 'left'
+        },
+        {
+          label: '待入',
+          value: 'right'
+        },
+        {
+          label: '已入',
+          value: 'right'
+        }
+      ]
     }
   },
   methods: {
@@ -86,23 +119,8 @@ export default {
       done()
     },
     clickRowHandler(row) {
-      this.$refs.table.clearSelection()
       this.$refs.table.toggleRowSelection(row)
     }
-    // ,
-    // selectionChangeHandler(val) {
-    //   if (val.length > 1) {
-    //     // 取出最后val的最后一个返回出来
-    //     const finalVal = val.pop()
-    //     // 清除所有选中
-    //     this.$refs.table.clearSelection()
-    //     // 给最后一个加上选中
-    //     this.$refs.table.toggleRowSelection(finalVal)
-    //     this.crud.selectionChangeHandler([finalVal])
-    //   } else {
-    //     this.crud.selectionChangeHandler(val)
-    //   }
-    // }
   }
 }
 </script>
diff --git a/src/views/archivesManage/caseManage/module/form.vue b/src/views/archivesManage/caseManage/module/form.vue
index 6c0aa8f..2696925 100644
--- a/src/views/archivesManage/caseManage/module/form.vue
+++ b/src/views/archivesManage/caseManage/module/form.vue
@@ -22,6 +22,7 @@
 
 <script>
 import { form } from '@crud/crud'
+import { caseNameIsRepeat, barcodeIsRepeat } from '@/api/archivesManage/caseManage'
 
 const defaultForm = {
   id: null,
@@ -31,36 +32,40 @@ const defaultForm = {
 export default {
   mixins: [form(defaultForm)],
   data() {
-    // var checkMaxLength = (rule, value, callback) => {
-    //   if (value !== undefined && (!Number.isInteger(value) || value <= 0)) {
-    //     callback(new Error('请输入正整数数字值'))
-    //   } else {
-    //     if (this.form.isDataType === 1 && value > 2000) {
-    //       callback(new Error('字符最大长度不能超过2000位'))
-    //     } else if (this.form.isDataType === 2 && value > 11) {
-    //       callback(new Error('数字最大长度不能超过11位'))
-    //     } else {
-    //       callback()
-    //     }
-    //   }
-    // }
-    // var checkFieldName = (rule, value, callback) => {
-    //   const reg = /^(([A-Za-z][A-Za-z_]*[a-zA-Z])|([A-Za-z]))$/
-    //   if (reg.test(value)) {
-    //     callback()
-    //   } else {
-    //     callback(new Error('字段标识只能由字母、字符“_”组成，并且必须以字母开头和结尾'))
-    //   }
-    // }
+    var checkCaseName = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('请输入盒名称'))
+      } else {
+        caseNameIsRepeat({ caseId: this.form.id, caseName: value }).then((res) => {
+          if (res) {
+            callback(new Error('盒名称重复'))
+          } else {
+            callback()
+          }
+        })
+      }
+    }
+    var checkBarcode = (rule, value, callback) => {
+      if (value) {
+        barcodeIsRepeat({ caseId: this.form.id, barcode: value }).then((res) => {
+          if (res) {
+            callback(new Error('条形码重复'))
+          } else {
+            callback()
+          }
+        })
+      } else {
+        callback()
+      }
+    }
     return {
       rules: {
         caseName: [
-          { required: true, message: '请输入盒名称', trigger: 'blur' }
+          { validator: checkCaseName, trigger: 'blur' }
+        ],
+        barcode: [
+          { validator: checkBarcode, trigger: 'blur' }
         ]
-        // ,
-        // barcode: [
-        //   { validator: checkFieldName, trigger: 'blur' }
-        // ]
       }
     }
   }
diff --git a/src/views/category/index.vue b/src/views/category/index.vue
index 38314d0..ba859cc 100644
--- a/src/views/category/index.vue
+++ b/src/views/category/index.vue
@@ -212,7 +212,11 @@ export default {
     [CRUD.HOOK.beforeToAdd](crud, form, btn) {
       const isCanAddKey = JSON.parse(localStorage.getItem('currentCategoryKey'))
       if (isCanAddKey.isType === 4 || isCanAddKey.isType === 5) {
-        this.$message.error('此门类下不可新建门类')
+        this.$notify({
+          title: '此门类下不可新建门类',
+          type: 'error',
+          duration: 2500
+        })
         return false
       }
     },
diff --git a/src/views/category/listBrowsing/index.vue b/src/views/category/listBrowsing/index.vue
index 392dfaf..ef1263f 100644
--- a/src/views/category/listBrowsing/index.vue
+++ b/src/views/category/listBrowsing/index.vue
@@ -75,7 +75,7 @@
 <script>
 import { FetchArchivesTypeManage } from '@/api/category/category'
 import { initArchivesView } from '@/api/archivesManage/archivesList'
-import { edit } from '@/api/category/listBrowsing'
+import { add } from '@/api/category/listBrowsing'
 import eForm from './module/form'
 import sortDialog from './module/sortDialog'
 import Vue from 'vue'
@@ -137,7 +137,7 @@ export default {
       FetchArchivesTypeManage({ categoryId: this.selectedCategory.id, isDataType: 2 }).then((res) => {
         this.table.right.data.splice(0, this.table.right.data.length)
         this.table.left.data.splice(0, this.table.left.data.length)
-        res.sort((item) => { return item.displayOrder - item.displayOrder }).forEach((item) => {
+        res.sort((item1, item2) => { return item1.displayOrder - item2.displayOrder }).forEach((item) => {
           if (item.isInput) {
             if (item.isDisplay) {
               this.table.right.data.push(item)
@@ -189,10 +189,10 @@ export default {
         item.isDisplay = false
         item.displayformatType = null
         item.displayLength = null
-        item.sort = null
+        item.displayOrder = null
         return item
       })
-      edit(deleteData).then((res) => {
+      add(deleteData).then((res) => {
         this.delAllLoading = false
         this.$notify({
           title: '删除成功',
diff --git a/src/views/category/listBrowsing/module/form.vue b/src/views/category/listBrowsing/module/form.vue
index 10e92e6..d848a97 100644
--- a/src/views/category/listBrowsing/module/form.vue
+++ b/src/views/category/listBrowsing/module/form.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import { edit } from '@/api/category/listBrowsing'
+import { add, edit } from '@/api/category/listBrowsing'
 export default {
   data() {
     return {
@@ -62,15 +62,27 @@ export default {
     save() {
       this.$refs['formData'].validate((valid) => {
         if (valid) {
-          edit(this.formData.fields).then((res) => {
-            this.$notify({
-              title: '保存成功',
-              type: 'success',
-              duration: 2500
+          if (this.title === '新增字段') {
+            add(this.formData.fields).then((res) => {
+              this.$notify({
+                title: '保存成功',
+                type: 'success',
+                duration: 2500
+              })
+              this.cuDialogVisible = false
+              this.$emit('refresh')
             })
-            this.cuDialogVisible = false
-            this.$emit('refresh')
-          })
+          } else {
+            edit(this.formData.fields).then((res) => {
+              this.$notify({
+                title: '保存成功',
+                type: 'success',
+                duration: 2500
+              })
+              this.cuDialogVisible = false
+              this.$emit('refresh')
+            })
+          }
         } else {
           return false
         }
diff --git a/src/views/category/listBrowsing/module/sortDialog.vue b/src/views/category/listBrowsing/module/sortDialog.vue
index 0c190a6..8a6d70c 100644
--- a/src/views/category/listBrowsing/module/sortDialog.vue
+++ b/src/views/category/listBrowsing/module/sortDialog.vue
@@ -18,7 +18,7 @@
 
 <script>
 import Sortable from 'sortablejs'
-import { edit } from '@/api/category/listBrowsing'
+import { order } from '@/api/category/listBrowsing'
 
 export default {
   data() {
@@ -47,9 +47,9 @@ export default {
     },
     handleSort() {
       this.sortTableData.forEach((item, index) => {
-        item.sort = index + 1
+        item.displayOrder = index + 1
       })
-      edit(this.sortTableData).then(() => {
+      order(this.sortTableData).then(() => {
         this.sortVisible = false
         this.$emit('refresh')
       })
diff --git a/src/views/category/orderingRule/index.vue b/src/views/category/orderingRule/index.vue
index 1c455f9..8dd05dc 100644
--- a/src/views/category/orderingRule/index.vue
+++ b/src/views/category/orderingRule/index.vue
@@ -61,8 +61,8 @@
 </template>
 
 <script>
-import { FetchArchivesTypeManage } from '@/api/category/category'
-import { edit } from '@/api/category/listBrowsing'
+import { getDisplayField } from '@/api/category/orderingRule'
+import { edit } from '@/api/category/orderingRule'
 import eForm from './module/form'
 import sortDialog from './module/sortDialog'
 import Vue from 'vue'
@@ -119,10 +119,10 @@ export default {
   },
   methods: {
     initData() {
-      FetchArchivesTypeManage({ categoryId: this.selectedCategory.id, isDataType: 2, isInput: 'true', isDisplay: 'true' }).then((res) => {
+      getDisplayField({ categoryId: this.selectedCategory.id, isDisPlayState: 'true' }).then((res) => {
         this.table.right.data.splice(0, this.table.right.data.length)
         this.table.left.data.splice(0, this.table.left.data.length)
-        res.sort((item) => { return item.queue - item.queue }).forEach((item) => {
+        res.sort((item1, item2) => { return item1.queue - item2.queue }).forEach((item) => {
           if (item.displayOrderBy) {
             this.table.right.data.push(item)
           } else {
diff --git a/src/views/category/orderingRule/module/form.vue b/src/views/category/orderingRule/module/form.vue
index 090e5db..bed446d 100644
--- a/src/views/category/orderingRule/module/form.vue
+++ b/src/views/category/orderingRule/module/form.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script>
-import { edit } from '@/api/category/listBrowsing'
+import { edit } from '@/api/category/orderingRule'
 export default {
   data() {
     return {
diff --git a/src/views/category/orderingRule/module/sortDialog.vue b/src/views/category/orderingRule/module/sortDialog.vue
index 4b4f7ce..1f6c150 100644
--- a/src/views/category/orderingRule/module/sortDialog.vue
+++ b/src/views/category/orderingRule/module/sortDialog.vue
@@ -18,7 +18,7 @@
 
 <script>
 import Sortable from 'sortablejs'
-import { edit } from '@/api/category/listBrowsing'
+import { order } from '@/api/category/orderingRule'
 
 export default {
   data() {
@@ -47,9 +47,9 @@ export default {
     },
     handleSort() {
       this.sortTableData.forEach((item, index) => {
-        item.sort = index + 1
+        item.queue = index + 1
       })
-      edit(this.sortTableData).then(() => {
+      order(this.sortTableData).then(() => {
         this.sortVisible = false
         this.$emit('refresh')
       })