修改零售单部分按钮渲染逻辑/码单打印添加删除打印记录功能

zkqy-ui/src/api/codeListManage/productCodeList.js

@@ -121,4 +121,14 @@ export function AutoPrinting(data) {
   })
 }
 
+// 删除 打印数据
+export function removeProductCodeASInventory(data) {
+  return request({
+    url: '/system/productCodeList/removeProductCodeASInventory',
+    method: 'delete',
+    //baseURL: process.env.VUE_APP_BASE_API1
+    data: data,
+  })
+}
+
 

zkqy-ui/src/views/orderMange/productInRecord/index.vue

@@ -60,13 +60,11 @@
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
-        >搜索
-        </el-button
-        >
+          >搜索
+        </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-        >重置
-        </el-button
-        >
+          >重置
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -127,28 +125,28 @@
       <!-- @selection-change="handleSelectionChange" -->
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <!-- <el-table-column label="序号" type="index" align="center" /> -->
-      <el-table-column label="码单号" align="center" prop="qrCode"/>
-      <el-table-column label="箱号" align="center" prop="boxNum"/>
-      <el-table-column label="品名" align="center" prop="productName"/>
+      <el-table-column label="码单号" align="center" prop="qrCode" />
+      <!-- <el-table-column label="箱号" align="center" prop="boxNum"/> -->
+      <el-table-column label="品名" align="center" prop="productName" />
       <el-table-column
         label="规格"
         align="center"
         prop="productSpecifications"
       />
-      <el-table-column label="色泽" align="center" prop="productColor"/>
+      <el-table-column label="色泽" align="center" prop="productColor" />
 
-      <el-table-column label="批号" align="center" prop="lotNum"/>
-      <el-table-column label="等级" align="center" prop="levels"/>
+      <el-table-column label="批号" align="center" prop="lotNum" />
+      <el-table-column label="等级" align="center" prop="levels" />
       <el-table-column label="包装" align="center" prop="packaging">
         <template slot-scope="scope">
           {{ getDictLabel(scope.row.packaging, dict.type.packaging_type) }}
         </template>
       </el-table-column>
-      <el-table-column label="箱数" align="center" prop="totalBoxNum"/>
+      <el-table-column label="箱数" align="center" prop="totalBoxNum" />
       <!-- <el-table-column label="筒数" align="center" prop="canisterNum" /> -->
 
-      <el-table-column label="毛重" align="center" prop="totalGrossWeight"/>
-      <el-table-column label="班次" align="center" prop="workShifts"/>
+      <el-table-column label="毛重" align="center" prop="totalGrossWeight" />
+      <el-table-column label="班次" align="center" prop="workShifts" />
       <!-- <el-table-column label="净重" align="center" prop="suttle" /> -->
       <el-table-column
         label="生产日期"
@@ -190,8 +188,8 @@
           <span>{{ parseTime(scope.row.warehousingTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="入库人" align="center" prop="depositor"/>
-      <el-table-column label="备注" align="center" prop="remark"/>
+      <el-table-column label="入库人" align="center" prop="depositor" />
+      <!-- <el-table-column label="备注" align="center" prop="remark"/> -->
       <el-table-column
         label="操作"
         align="center"
@@ -221,9 +219,8 @@
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"
                   v-hasPermi="['system:ProductWarehousingRecord:remove']"
-                >删除
-                </el-button
-                >
+                  >删除
+                </el-button>
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -243,28 +240,28 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="码单号" prop="qrCode">
-          <el-input v-model="form.qrCode" placeholder="请输入码单号"/>
+          <el-input v-model="form.qrCode" placeholder="请输入码单号" />
         </el-form-item>
         <el-form-item label="码单唯一标识" prop="qrCodeId">
-          <el-input v-model="form.qrCodeId" placeholder="请输入码单唯一标识"/>
+          <el-input v-model="form.qrCodeId" placeholder="请输入码单唯一标识" />
         </el-form-item>
         <el-form-item label="批号" prop="lotNum">
-          <el-input v-model="form.lotNum" placeholder="请输入批号"/>
+          <el-input v-model="form.lotNum" placeholder="请输入批号" />
         </el-form-item>
         <el-form-item label="货品编号" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入货品编号"/>
+          <el-input v-model="form.productId" placeholder="请输入货品编号" />
         </el-form-item>
         <el-form-item label="等级" prop="levels">
-          <el-input v-model="form.levels" placeholder="请输入等级"/>
+          <el-input v-model="form.levels" placeholder="请输入等级" />
         </el-form-item>
         <el-form-item label="筒数" prop="canisterNum">
-          <el-input v-model="form.canisterNum" placeholder="请输入筒数"/>
+          <el-input v-model="form.canisterNum" placeholder="请输入筒数" />
         </el-form-item>
         <el-form-item label="箱数" prop="boxNum">
-          <el-input v-model="form.boxNum" placeholder="请输入箱数"/>
+          <el-input v-model="form.boxNum" placeholder="请输入箱数" />
         </el-form-item>
         <el-form-item label="净重" prop="suttle">
-          <el-input v-model="form.suttle" placeholder="请输入净重"/>
+          <el-input v-model="form.suttle" placeholder="请输入净重" />
         </el-form-item>
         <el-form-item label="生产日期" prop="productionDate">
           <el-date-picker
@@ -277,16 +274,16 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="机台" prop="machineTool">
-          <el-input v-model="form.machineTool" placeholder="请输入机台"/>
+          <el-input v-model="form.machineTool" placeholder="请输入机台" />
         </el-form-item>
         <el-form-item label="毛重" prop="grossWeight">
-          <el-input v-model="form.grossWeight" placeholder="请输入毛重"/>
+          <el-input v-model="form.grossWeight" placeholder="请输入毛重" />
         </el-form-item>
         <el-form-item label="包装" prop="packaging">
-          <el-input v-model="form.packaging" placeholder="请输入包装"/>
+          <el-input v-model="form.packaging" placeholder="请输入包装" />
         </el-form-item>
         <el-form-item label="班次" prop="workShifts">
-          <el-input v-model="form.workShifts" placeholder="请输入班次"/>
+          <el-input v-model="form.workShifts" placeholder="请输入班次" />
         </el-form-item>
         <el-form-item label="外贸号" prop="foreignTradeNumber">
           <el-input
@@ -295,22 +292,22 @@
           />
         </el-form-item>
         <el-form-item label="筒重" prop="canisterWeight">
-          <el-input v-model="form.canisterWeight" placeholder="请输入筒重"/>
+          <el-input v-model="form.canisterWeight" placeholder="请输入筒重" />
         </el-form-item>
         <el-form-item label="箱重/车重" prop="boxWeight">
-          <el-input v-model="form.boxWeight" placeholder="请输入箱重/车重"/>
+          <el-input v-model="form.boxWeight" placeholder="请输入箱重/车重" />
         </el-form-item>
         <el-form-item label="管色" prop="tubeColor">
-          <el-input v-model="form.tubeColor" placeholder="请输入管色"/>
+          <el-input v-model="form.tubeColor" placeholder="请输入管色" />
         </el-form-item>
         <el-form-item label="端口" prop="comPort">
-          <el-input v-model="form.comPort" placeholder="请输入端口"/>
+          <el-input v-model="form.comPort" placeholder="请输入端口" />
         </el-form-item>
         <el-form-item label="打印格式" prop="printFormat">
-          <el-input v-model="form.printFormat" placeholder="请输入打印格式"/>
+          <el-input v-model="form.printFormat" placeholder="请输入打印格式" />
         </el-form-item>
         <el-form-item label="库位" prop="storageLocation">
-          <el-input v-model="form.storageLocation" placeholder="请输入库位"/>
+          <el-input v-model="form.storageLocation" placeholder="请输入库位" />
         </el-form-item>
         <el-form-item label="区域编号" prop="warehouseregionId">
           <el-input
@@ -326,13 +323,13 @@
           />
         </el-form-item>
         <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志"/>
+          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
         </el-form-item>
         <el-form-item label="创建者编号" prop="createById">
-          <el-input v-model="form.createById" placeholder="请输入创建者编号"/>
+          <el-input v-model="form.createById" placeholder="请输入创建者编号" />
         </el-form-item>
         <el-form-item label="更新者编号" prop="updateById">
-          <el-input v-model="form.updateById" placeholder="请输入更新者编号"/>
+          <el-input v-model="form.updateById" placeholder="请输入更新者编号" />
         </el-form-item>
         <el-form-item label="入库时间" prop="warehousingTime">
           <el-date-picker
@@ -345,7 +342,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="入库人" prop="depositor">
-          <el-input v-model="form.depositor" placeholder="请输入入库人"/>
+          <el-input v-model="form.depositor" placeholder="请输入入库人" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -362,9 +359,10 @@ import {
   getProductWarehousingRecord,
   delProductWarehousingRecord,
   addProductWarehousingRecord,
-  updateProductWarehousingRecord, deleteProductInventory,
+  updateProductWarehousingRecord,
+  deleteProductInventory,
 } from "@/api/system/ProductWarehousingRecord";
-import {getDictLabel} from "@/utils/other";
+import { getDictLabel } from "@/utils/other";
 
 export default {
   name: "ProductWarehousingRecord",
@@ -541,7 +539,13 @@ export default {
     handleDelete(row) {
       // const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除码单号为"' + row.qrCode + "箱号为：" + row.boxNum + '"的数据项？')
+        .confirm(
+          '是否确认删除码单号为"' +
+            row.qrCode +
+            "箱号为：" +
+            row.boxNum +
+            '"的数据项？'
+        )
         .then(function () {
           return deleteProductInventory(row);
         })

zkqy-ui/src/views/orderMange/productOutRecord/index.vue

@@ -188,7 +188,7 @@
         </template>
       </el-table-column>
       <el-table-column label="出库人" align="center" prop="depositor" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
       <el-table-column
         v-if="false"
         label="操作"

zkqy-ui/src/views/orderMange/retailMange/index.vue

@@ -159,7 +159,7 @@
                 操作<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item>
+                <el-dropdown-item v-show="scope.row.status == 1">
                   <el-button
                     size="mini"
                     type="text"
@@ -186,13 +186,13 @@
                     >提交
                   </el-button>
                 </el-dropdown-item>
-                <el-dropdown-item v-show="scope.row.status == 2">
+                <el-dropdown-item v-show="scope.row.status == 5">
                   <el-button
                     size="mini"
                     type="text"
                     icon="el-icon-folder-delete"
                     @click="handleSubmitCancel(scope.row)"
-                    >取消提交
+                    >撤销
                   </el-button>
                 </el-dropdown-item>
                 <el-dropdown-item v-show="scope.row.status != 1">
@@ -219,7 +219,7 @@
                     >打印出库单
                   </el-button>
                 </el-dropdown-item>
-                <el-dropdown-item>
+                <el-dropdown-item v-show="scope.row.status == 1">
                   <el-button
                     size="mini"
                     type="text"
@@ -1209,6 +1209,7 @@ export default {
     //审计新增
     async addHandler() {
       this.isEdit = false;
+
       await this.getDropDownData();
       // 判断是否是销售员
       console.log(this.userInfo);
@@ -1222,7 +1223,9 @@ export default {
       this.title = "新增零售单";
       this.open = true;
       this.$nextTick(() => {
-        this.$refs["formDataRef"].clearValidate();
+        this.$refs.formDataRef.resetFields();
+        this.formData.orderRemark = "";
+        // this.$refs["formDataRef"].clearValidate();
       });
     },
     // 获取下拉框数据