Merge remote-tracking branch 'origin/master'

zkqy-ui/src/api/system/retailMange.js

@@ -58,6 +58,14 @@ export function submitRetailOrder(params) {
     data: params
   })
 }
+// 提交零售单  零售单提交  有id时的接口
+export function submitProductInvoice(params) {
+  return request({
+    url: '/system/ProductInvoice',
+    method: 'put',
+    data: params
+  })
+}
 // 提交零售单  零售单提交
 export function cancelRetailOrder(params) {
   return request({

zkqy-ui/src/components/FormGroup/formList.vue

@@ -135,12 +135,9 @@ export default {
         //   item.template.defaultValue[toUnderline(key)] =
         //     item.template.defaultValue[key];
         // }
-        console.log(item);
         this.defaultValue[item.tableName] = item.template?.defaultValue || {};
       });
       for (const key in this.defaultValue) {
-        console.log(JSON.parse(JSON.stringify(this.defaultValue)));
-        console.log(this.$refs[key]);
         this.$refs[key][0]?.setData(this.defaultValue[key]);
       }
     },
@@ -190,7 +187,6 @@ export default {
           // });
           // item.formInfo.jsonData = disableFormItem(item.formInfo.jsonData);
         });
-
         resolve(formList);
       });
     },

zkqy-ui/src/views/orderMange/components/dialogForm/RetailProvide.vue

@@ -262,7 +262,8 @@ export default {
         //   label: "等级",
         // },
         {
-          id: "actualWeight",
+          // id: "actualWeight",
+          id: "boxNum",
           label: "箱数",
         },
         // {

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

@@ -66,6 +66,7 @@
             plain
             icon="el-icon-plus"
             size="mini"
+            v-hasPermi="['system:RetailOrder:insert']"
             @click="addHandler"
             >新增
           </el-button>
@@ -88,6 +89,7 @@
             icon="el-icon-delete"
             size="mini"
             :disabled="multiple"
+            v-hasPermi="['system:RetailOrder:remove']"
             @click="myDeleteHandler"
             >删除
           </el-button>
@@ -163,6 +165,7 @@
                     size="mini"
                     type="text"
                     icon="el-icon-edit"
+                    v-hasPermi="['system:RetailOrder:update']"
                     @click="handleUpdate(scope.row)"
                     >修改
                   </el-button>
@@ -176,11 +179,12 @@
                     >详情
                   </el-button>
                 </el-dropdown-item>
-                <el-dropdown-item v-show="scope.row.status == 1">
+                <el-dropdown-item>
                   <el-button
                     size="mini"
                     type="text"
                     icon="el-icon-folder-checked"
+                    v-hasPermi="['system:RetailOrder:submit']"
                     @click="handleSubmit(scope.row)"
                     >提交
                   </el-button>
@@ -190,6 +194,7 @@
                     size="mini"
                     type="text"
                     icon="el-icon-folder-delete"
+                    v-hasPermi="['system:RetailOrder:update']"
                     @click="handleSubmitCancel(scope.row)"
                     >撤销
                   </el-button>
@@ -203,13 +208,7 @@
                     >出库明细
                   </el-button>
                 </el-dropdown-item>
-                <el-dropdown-item
-                  v-show="
-                    scope.row.status == 1 ||
-                    scope.row.status == 2 ||
-                    scope.row.status == 8
-                  "
-                >
+                <el-dropdown-item v-show="scope.row.status == 5">
                   <el-button
                     size="mini"
                     type="text"
@@ -223,6 +222,7 @@
                     size="mini"
                     type="text"
                     icon="el-icon-delete"
+                    v-hasPermi="['system:RetailOrder:remove']"
                     @click="myDeleteHandler(scope.row)"
                     >删除
                   </el-button>
@@ -686,6 +686,7 @@ import {
   submitRetailOrder,
   cancelRetailOrder,
   deleRetailOrder,
+  submitProductInvoice,
 } from "@/api/system/retailMange.js";
 import { listData } from "@/api/system/tenant/data";
 import { getToken } from "@/utils/auth";
@@ -2412,7 +2413,8 @@ export default {
         };
         payLoad.status = 5;
         // let res = await addProductInvoice(payLoad);
-        let res = await submitRetailOrder(payLoad);
+        let reqAPI = isEdit ? submitProductInvoice : submitRetailOrder;
+        let res = await reqAPI(payLoad);
         if (res.code == 200) {
           this.$message.success("提交成功");
           this.deliverShow = false;

zkqy-ui/src/views/tablelist/commonTable/listInfo.vue

@@ -1091,8 +1091,10 @@ export default {
 
       if (showValue) {
         for (const key of Object.keys(showValue)) {
-          showValue[toUnderline(key)] = showValue[key];
-          delete showValue[key];
+          if (key != "remark") {
+            showValue[toUnderline(key)] = showValue[key];
+            delete showValue[key];
+          }
         }
         mainForm.showTemplate.resultMap = [showValue];
       }
@@ -1437,6 +1439,7 @@ export default {
     },
     //提交编辑结果按钮回调
     async editConfirmHandler() {
+      console.log("wer");
       if (this.$refs.addFromRef && this.formType == "dragForm") {
         this.$refs.addFromRef
           .getData()