diff --git a/src/api/quality/pkg.js b/src/api/quality/pkg.js
index a161d0f..5d98db2 100644
--- a/src/api/quality/pkg.js
+++ b/src/api/quality/pkg.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取扫码规则
 export function codeparser () {
 	return request({
-		url: '/admin/common/codeparser',
+		url: '/admin/common/codeparser/query',
 		method: 'get',
 	})
 }
@@ -20,7 +20,7 @@ export function getactivedpackorders (data) {
 // 获取激活的包装单
 export function getPackorder () {
 	return request({
-		url: `/admin/log/packorder?status=26`,
+		url: `/admin/log/packorder/query?status=26`,
 		method: 'get',
 	})
 }
@@ -28,7 +28,7 @@ export function getPackorder () {
 //获取指定包装单下的包装项
 export function packorderitemlst (packorderid) {
 	return request({
-		url: `/admin/log/packorderitemlst?packorderid=${packorderid}`,
+		url: `/admin/log/packorderitemlst/query?packorderid=${packorderid}`,
 		method: 'get',
 	})
 
@@ -37,17 +37,30 @@ export function packorderitemlst (packorderid) {
 //扫码创建包装
 export function createPkg (data) {
 	return request({
-		url: `/rpc/pack/packordersvr/create`,
+		url: `/admin/log/packorder/openpackorder`,
+		method: 'post',
+		data: data
+	})
+}
+
+//选择包装创建包装
+export function openpackorderwithtemplate (data) {
+	return request({
+		url: `/admin/log/packorder/openpackorderwithtemplate`,
 		method: 'post',
 		data: data
 	})
 }
 
 //关闭包装
-export function closePkg (id) {
+export function closePkg (data) {
 	return request({
-		url: `/admin/log/packorder/${id}?_t=close`,
+		url: `/admin/log/packorder/closepackorder`,
 		method: 'post',
-		data: {}
+		data: data
 	})
 }
+
+
+
+
diff --git a/src/views/quality/pkg.vue b/src/views/quality/pkg.vue
index 03d39d8..952bc16 100644
--- a/src/views/quality/pkg.vue
+++ b/src/views/quality/pkg.vue
@@ -15,7 +15,8 @@
               :class="[{'active-pck':activePkg == item.PackOrderId}]">{{item.PackOrderId}}</li>
         </ul>
         <div style="width:100%; height:10px;background:#F1F3FA" />
-        <div class="package open">打开包装</div>
+        <div class="package open"
+             @click="openPkg">打开包装</div>
         <div class="package"
              @click="selfClosePkg">关闭包装</div>
       </div>
@@ -73,6 +74,30 @@
         <div style="background: #F5F7FC; border-radius: 4px; margin: 8px; color: #fff;text-align:center">&nbsp;</div>
       </div>
     </footer>
+    <el-dialog title="选择模板"
+               width="60%"
+               :visible.sync="isVisible">
+      <el-table ref="singleTable"
+                :data="tempData"
+                highlight-current-row
+                @current-change="handleCurrentChange"
+                style="width: 100%">
+        <el-table-column v-for="item in temHeaders"
+                         :key="item"
+                         :label="getColumnName(`${item}`)"
+                         show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{scope.row[item]}}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer"
+           class="dialog-footer">
+        <el-button @click="isVisible = false">取 消</el-button>
+        <el-button type="primary"
+                   @click="completeCreatePkg">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -102,6 +127,16 @@ export default {
       codeRules: [], //扫码规则
       autofocus: true,
       showInput: true,
+      isVisible: false,
+      tempData: [],
+      temHeaders: [
+        'LOG_PackTemplate-PackTypeId',
+        'LOG_PackTemplate-PackOrderSn',
+        'LOG_PackTemplate-BoxSn',
+        'LOG_PackTemplate-Descr',
+      ],
+      chooseTemRow: {},
+      artId: '',
     }
   },
   created() {
@@ -123,7 +158,6 @@ export default {
           res.data.forEach((element) => {
             element.PackOrderId = element['LOG_PackOrder-PackOrderId']
           })
-          this.getColumn(res.data[0].PackOrderId)
         }
         this.pkgs = res.data
         this.loading = false
@@ -184,7 +218,20 @@ export default {
     },
     // 关闭包装
     closePkg(isSelf = false) {
-      api.closePkg(this.activePkg).then((res) => {
+      let params = [this.activePkg]
+      // 短包
+      if (isSelf) {
+        let isCom = []
+        this.tableData.forEach((item) => {
+          if (item.status == 0) {
+            isCom.push(item['LOG_PackOrderItemlst-Pos'])
+          }
+        })
+        params.push(isCom)
+      } else {
+        params.push([])
+      }
+      api.closePkg(params).then((res) => {
         if (res.code == 200) {
           this.pkgs = this.pkgs.filter(
             (pkg) => pkg.PackOrderId != this.activePkg
@@ -275,7 +322,7 @@ export default {
         if (isCom && isCom.length) {
           this.$message({
             type: 'error',
-            message: `条码${code}重复！`,
+            message: `条码${code}已入包装！`,
             showClose: true,
           })
         } else if (unCom && unCom.length) {
@@ -379,11 +426,51 @@ export default {
     },
     // 创建新包装
     createPkg(code) {
+      api.createPkg([code]).then((res) => {
+        if (res.data) {
+          if (res.data.length == 1) {
+            this.tempData = res.data
+            this.chooseTemRow = res.data[0]
+            this.completeCreatePkg()
+          } else {
+            this.tempData = res.data
+            this.isVisible = true
+          }
+        }
+      })
+    },
+    // 打开包装
+    openPkg() {
+      this.$prompt('扫描条码', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+      })
+        .then(({ value }) => {
+          let code = this.getRuleCode(value)
+          // code = 'ART100'
+          this.artId = code
+          this.createPkg(code)
+        })
+        .catch(() => {})
+    },
+    handleCurrentChange(val) {
+      this.chooseTemRow = val
+    },
+    completeCreatePkg() {
       api
-        .createPkg({
-          code: code,
+        .openpackorderwithtemplate([
+          this.artId,
+          this.chooseTemRow['LOG_PackTemplate-PackTemplateId'],
+        ])
+        .then((res) => {
+          if (res.code == 200) {
+            this.isVisible = false
+            this.tempData = []
+            this.chooseTemRow = {}
+            this.artId = ''
+            this.getPackorder()
+          }
         })
-        .then((res) => {})
     },
   },
 }
@@ -446,12 +533,12 @@ li {
     .pkg-list-left {
       margin: 0 10px 10px 0;
       padding: 10px 0 0 10px;
-      width: 30%;
+      width: 20%;
       height: calc(65vh);
       background: #ffffff;
     }
     .pkg-list-right {
-      width: 70%;
+      width: 80%;
       height: 65vh;
       background: #ffffff;
       padding: 10px;