doctorCheck

package-lock.json

@@ -19,8 +19,10 @@
         "node-polyfill-webpack-plugin": "^2.0.1",
         "print-js": "^1.6.0",
         "sortablejs": "^1.15.0",
+        "umy-ui": "^1.1.6",
         "vue": "^2.6.14",
         "vue-contextmenujs": "^1.4.9",
+        "vue-img-cutter": "^3.0.5",
         "vue-json-excel": "^0.3.0",
         "vue-meta": "^2.4.0",
         "vue-print-nb": "^1.7.5",
@@ -11531,6 +11533,43 @@
       "resolved": "https://registry.npmmirror.com/typedarray/-/typedarray-0.0.6.tgz",
       "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
     },
+    "node_modules/umy-table": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmmirror.com/umy-table/-/umy-table-1.1.8.tgz",
+      "integrity": "sha512-yqPMFwZ6MUNqI73KamsNKBTbHRA7VuVZDEWobaySghtf4n/s7INuTNQoADB/ROVK57WOXr99Xpnol0aMqGlASA==",
+      "dependencies": {
+        "async-validator": "~1.8.1",
+        "deepmerge": "^1.2.0",
+        "normalize-wheel": "^1.0.1",
+        "resize-observer-polyfill": "^1.5.0",
+        "throttle-debounce": "^1.0.1",
+        "vuedraggable": "^2.23.2",
+        "xe-utils": "^3.0.0-beta.12"
+      },
+      "peerDependencies": {
+        "vue": ">= 2.6.0 < 3",
+        "xe-utils": ">= 3"
+      }
+    },
+    "node_modules/umy-ui": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmmirror.com/umy-ui/-/umy-ui-1.1.6.tgz",
+      "integrity": "sha512-wX0S29B5sFn8q0MvU9PEl8DGZeQmZXOJlLrwaCJ2UHiIQZCANWgXMBjjQgpaequ1gRZ8BekEu7Sn7hJccm9YMQ==",
+      "dependencies": {
+        "async-validator": "~1.8.1",
+        "deepmerge": "^1.2.0",
+        "normalize-wheel": "^1.0.1",
+        "resize-observer-polyfill": "^1.5.0",
+        "throttle-debounce": "^1.0.1",
+        "umy-table": "1.1.8",
+        "vuedraggable": "^2.23.2",
+        "xe-utils": "^3.0.0-beta.12"
+      },
+      "peerDependencies": {
+        "vue": ">= 2.6.0 < 3",
+        "xe-utils": ">= 3"
+      }
+    },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -12145,6 +12184,19 @@
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
       "dev": true
     },
+    "node_modules/vuedraggable": {
+      "version": "2.24.3",
+      "resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-2.24.3.tgz",
+      "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
+      "dependencies": {
+        "sortablejs": "1.10.2"
+      }
+    },
+    "node_modules/vuedraggable/node_modules/sortablejs": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.10.2.tgz",
+      "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+    },
     "node_modules/vuex": {
       "version": "3.6.2",
       "resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz",
@@ -12734,6 +12786,11 @@
         }
       }
     },
+    "node_modules/xe-utils": {
+      "version": "3.5.32",
+      "resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.32.tgz",
+      "integrity": "sha512-R8ZT2lRnRBQO3pchM1za/Aru+/29DVDWD/OmOFODWWGkiQYz0iVIr8Bq8uKXS6zMhEsSqVCrn46bXzfe/Agjcw=="
+    },
     "node_modules/xlsx": {
       "version": "0.18.5",
       "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz",

src/components/common/LocalConfig.vue

@@ -92,20 +92,25 @@
               <el-form-item label="pacs看图分类">
                 <el-select v-model="LocalConfig.doctorCheck.pacsType" placeholder="pacs图片分类" clearable filterable
                   size="small">
-                  <el-option v-for="item in localDict.pacsTypes" :key="item.value" :label="item.label" :value="item.value" />
+                  <el-option v-for="item in localDict.pacsTypes" :key="item.value" :label="item.label"
+                    :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="全选录入框">
-                <el-checkbox v-model="LocalConfig.doctorCheck.isSelectAll" size="small" true-label="Y" false-label="N" />
+                <el-checkbox v-model="LocalConfig.doctorCheck.isSelectAll" size="small" true-label="Y"
+                  false-label="N" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="自动下一个项目">
-                
-                <el-checkbox v-model="LocalConfig.doctorCheck.isAutoNext" size="small" true-label="Y" false-label="N" />
+              <el-tooltip content="医生诊台保存结果后，自动跳至下一个项目"
+                placement="top">
+                <el-form-item label="自动下个项目">
+                  <el-checkbox v-model="LocalConfig.doctorCheck.isAutoNext" size="small" true-label="Y"
+                    false-label="N" />
                 </el-form-item>
+              </el-tooltip>
             </el-col>
           </el-row>
           <el-row>
@@ -122,19 +127,20 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="7">
               <el-form-item label="项目类别">
                 <el-cascader :options="dict.itemTypeTree" v-model="LocalConfig.doctorCheck.queueItemTypeIds"
                   popper-class="example" style="width:240px;" :props="{
                     checkStrictly: true, expandTrigger: 'hover', label: 'displayName', value: 'id',
-                    id: 'id',children: 'treeChildren',multiple:true}" 
-                    clearable filterable size="small"  collapse-tags>
+                    id: 'id', children: 'treeChildren', multiple: true
+                  }" clearable filterable size="small" collapse-tags>
                 </el-cascader>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="6">
               <el-form-item label="排队叫号播音">
-                <el-checkbox v-model="LocalConfig.doctorCheck.isBroadcast" size="small" true-label="Y" false-label="N" />
+                <el-checkbox v-model="LocalConfig.doctorCheck.isBroadcast" size="small" true-label="Y"
+                  false-label="N" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -180,6 +186,7 @@ export default {
         doctorCheck: { // 医生诊台
           isCheckPicture: false, // 是否显示检查图片
           isSelectAll: 'N', // 录入结果时，是否全选
+          isAutoNext:'N',
           pacsType: 'image',
           isQueue: 'N',  //启用分诊排队
           queueRoom: '',  //默认分诊房间

src/views/doctorCheck/doctorCheck.vue

@@ -110,6 +110,7 @@ export default {
           isCheckPicture: false, // 是否显示检查图片
           isQueue: 'N',  //启用分诊排队
           queueRoom: '',  //默认分诊房间
+          isAutoNext: 'N',  // 保存完结果，是否自动下一条记录
         }
       },
       LocalConfigInit: {},
@@ -652,9 +653,26 @@ export default {
             this.doctorCheck.RegisterCheckEdit.completeFlag = '1';
             //更新组合项目列表记录状态
             let lfind = arrayExistObj(this.doctorCheck.RegisterCheckList, 'id', body.registerCheckId)
-            if (lfind > -1) this.doctorCheck.RegisterCheckList[lfind].completeFlag = '1'
+            if (lfind > -1) {
+              this.doctorCheck.RegisterCheckList[lfind].completeFlag = '1'
+
+              // 保存成功后，是否自动下一个项目
+              if (this.LocalConfig.doctorCheck.isAutoNext == 'Y') {
+                // this.doctorCheck.RegisterCheckList   registerCheckId
+                lfind = Number(lfind) + 1
+                if (this.doctorCheck.RegisterCheckList.length >= lfind) {
+                  this.doctorCheck.RegisterCheckId = this.doctorCheck.RegisterCheckList[lfind].id
+                  this.doctorCheck.asbitemName = this.doctorCheck.RegisterCheckList[lfind].asbitemName
+                  this.doctorCheck.checkRequestNo = this.doctorCheck.RegisterCheckList[lfind].checkRequestNo
+
+                  this.dataTransOpts.tableS.register_check.id = this.doctorCheck.RegisterCheckList[lfind].id
 
-            console.log('操作成功')
+                  this.dataTransOpts.refresh.register_check.S++
+                  this.dataTransOpts.refresh.register_check_item.M++
+                }
+              }
+            }
+            //console.log('操作成功')
           } else {
             this.$message.error({ showClose: true, message: res.message })
           }