销售出库添加新出库标识

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

@@ -227,7 +227,7 @@ export default {
           status: 1,
           boxNum: item.boxNum,
           productLevel: item.productLevel,
-          returnReceipt: "0",
+          returnReceipt: 0,
         };
       });
       let result = await printOutsourceOrder(payload);
@@ -316,7 +316,7 @@ export default {
         if (!batchOptions.find((item) => item.value === row.batchNumber)) {
           batchOptions.push({
             value: row.batchNumber,
-            label: row.batchNumber,
+            label: row.batchNumber + "批",
           });
         }
       });

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

@@ -75,7 +75,11 @@
             <el-table-column label="操作" v-if="row.status != 6">
               <template slot-scope="scope">
                 <el-button
-                  v-show="!props.row.batchNumber || props.row.batchState == 1"
+                  v-show="
+                    !props.row.batchNumber ||
+                    props.row.batchState == 1 ||
+                    scope.row.confirmOut == 0
+                  "
                   size="mini"
                   type="danger"
                   @click="handleDelete(scope.$index, scope.row)"
@@ -213,7 +217,7 @@ export default {
             billingType: "1",
             receivedAmount: 0,
             status: 1,
-            returnReceipt: "0",
+            returnReceipt: 0,
             orderUpdate: isLastReAcount,
           };
           let res = await againRecordBatch(payload);
@@ -473,11 +477,10 @@ export default {
         if (!batchOptions.find((item) => item.value === row.batchNumber)) {
           batchOptions.push({
             value: row.batchNumber,
-            label: row.batchNumber,
+            label: row.batchNumber + "批",
           });
         }
       });
-
       this.batchOptions = batchOptions;
     },
   },

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

@@ -300,7 +300,13 @@
           >
             <el-table-column type="expand">
               <template slot-scope="props">
-                <el-table v-if="load" :data="props.row.children" border stripe>
+                <el-table
+                  :row-style="rowStyleFun"
+                  v-if="load"
+                  :data="props.row.children"
+                  border
+                  row-key="id"
+                >
                   <el-table-column type="index" width="50" />
                   <el-table-column
                     v-for="col in columns"
@@ -312,7 +318,9 @@
                   <el-table-column label="操作">
                     <template slot-scope="scope">
                       <el-button
-                        v-show="props.row.batchState == 1"
+                        v-show="
+                          props.row.batchState == 1 || scope.row.confirmOut == 0
+                        "
                         size="mini"
                         type="danger"
                         @click="
@@ -463,6 +471,20 @@ export default {
     };
   },
   methods: {
+    // 行样式
+    rowStyleFun(scope) {
+      let { row, rowIndex } = scope;
+      if (row.confirmOut == 0) {
+        console.log(row.confirmOut == 0);
+        //手持机出库数据  还未进行pc出库
+        // return "background-color: #55e905;";
+        return {
+          backgroundColor: "#55e905",
+        };
+      } else {
+        return {};
+      }
+    },
     //删除回滚对应产品的库存
     handleDelete(index, row, prop) {
       this.$confirm(
@@ -496,6 +518,7 @@ export default {
         saleOrderNo: tree.saleNo,
         productNo: tree.productNo,
         isEnablePaging: false,
+        batchNumber: tree.batchNumber,
       });
       if (res.code == 200) {
         tree.children = res.rows;
@@ -531,13 +554,13 @@ export default {
             temp.list.push(item);
           } else {
             this.batchMap[item.batchNumber] = {
-              value: item.batchNumber,
+              value: item.batchNumber + "",
               label: item.batchNumber + "批",
               list: [item],
             };
           }
         } else {
-          this.batchOptions[0].list.push(item);
+          this.batchMap[0].list.push(item);
         }
       });
       this.batchOptions = Object.values(this.batchMap);
@@ -550,8 +573,9 @@ export default {
       console.log("lotRes", lotRes);
       if (lotRes.code == 200) {
         this.initPatchData(lotRes.data);
+        this.detailVisible = true;
         this.$nextTick(() => {
-          this.detailVisible = true;
+          this.$refs.tableRef.doLayout();
         });
       }
     },
@@ -698,6 +722,7 @@ export default {
               }
               delete payLoad.documentTypeName;
               if (payLoad.batchNumber == "all") payLoad.batchNumber = null;
+              payLoad.outType = "all"; //当前默认全部出库
               let res = await confirmNoticeOutStorage(payLoad);
               // let res = await noticeOutStorage(payLoad);
               if (res.code == 200) {

zkqy-ui/src/views/system/user/index.vue

@@ -96,13 +96,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>
 
@@ -115,9 +113,8 @@
               size="mini"
               @click="handleAdd"
               v-hasPermi="['system:user:add']"
-            >新增
-            </el-button
-            >
+              >新增
+            </el-button>
           </el-col>
           <!-- <el-col :span="1.5">
             <el-button
@@ -140,9 +137,8 @@
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['system:user:remove']"
-            >删除
-            </el-button
-            >
+              >删除
+            </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -152,9 +148,8 @@
               size="mini"
               @click="handleImport"
               v-hasPermi="['system:user:import']"
-            >导入
-            </el-button
-            >
+              >导入
+            </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -165,9 +160,8 @@
               size="mini"
               @click="handleExport"
               v-hasPermi="['system:user:export']"
-            >导出
-            </el-button
-            >
+              >导出
+            </el-button>
             <ExcelDownLoad
               v-else
               :headerList="headerList"
@@ -188,7 +182,7 @@
           ref="tableRef"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="selection" width="50" align="center"/>
+          <el-table-column type="selection" width="50" align="center" />
           <el-table-column
             label="用户编号"
             align="center"
@@ -275,32 +269,26 @@
                   处理<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item
-                  >
+                  <el-dropdown-item>
                     <el-button
                       size="mini"
                       type="text"
                       icon="el-icon-edit"
                       @click="handleUpdate(scope.row)"
                       v-hasPermi="['system:user:edit']"
-                    >修改
-                    </el-button
-                    >
-                  </el-dropdown-item
-                  >
-                  <el-dropdown-item
-                  >
+                      >修改
+                    </el-button>
+                  </el-dropdown-item>
+                  <el-dropdown-item>
                     <el-button
                       size="mini"
                       type="text"
                       icon="el-icon-delete"
                       @click="handleDelete(scope.row)"
                       v-hasPermi="['system:user:remove']"
-                    >删除
-                    </el-button
-                    >
-                  </el-dropdown-item
-                  >
+                      >删除
+                    </el-button>
+                  </el-dropdown-item>
                   <el-dropdown-item>
                     <el-dropdown
                       size="mini"
@@ -311,24 +299,21 @@
                         size="mini"
                         type="text"
                         icon="el-icon-d-arrow-right"
-                      >更多
-                      </el-button
-                      >
+                        >更多
+                      </el-button>
                       <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item
                           command="handleResetPwd"
                           icon="el-icon-key"
                           v-hasPermi="['system:user:resetPwd']"
-                        >重置密码
-                        </el-dropdown-item
-                        >
+                          >重置密码
+                        </el-dropdown-item>
                         <el-dropdown-item
                           command="handleAuthRole"
                           icon="el-icon-circle-check"
                           v-hasPermi="['system:user:edit']"
-                        >分配角色
-                        </el-dropdown-item
-                        >
+                          >分配角色
+                        </el-dropdown-item>
                       </el-dropdown-menu>
                     </el-dropdown>
                   </el-dropdown-item>
@@ -450,7 +435,6 @@
               />
             </el-form-item>
           </el-col>
-
         </el-row>
 
         <el-row>
@@ -473,9 +457,8 @@
                   v-for="dict in dict.type.sys_normal_disable"
                   :key="dict.value"
                   :label="dict.value"
-                >{{ dict.label }}
-                </el-radio
-                >
+                  >{{ dict.label }}
+                </el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -535,9 +518,8 @@
                   v-for="dict in dictLoginTools"
                   :key="dict.value"
                   :label="dict.value"
-                >{{ dict.label }}
-                </el-radio
-                >
+                  >{{ dict.label }}
+                </el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -572,7 +554,7 @@
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport"/>
+            <el-checkbox v-model="upload.updateSupport" />
             是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
@@ -581,9 +563,8 @@
             :underline="false"
             style="font-size: 12px; vertical-align: baseline"
             @click="importTemplate"
-          >下载模板
-          </el-link
-          >
+            >下载模板
+          </el-link>
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -605,20 +586,23 @@ import {
   changeUserStatus,
   deptTreeSelect,
 } from "@/api/system/user";
-import {getToken} from "@/utils/auth";
+import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {mapGetters} from "vuex";
-import {getIsExistUser} from "@/api/system/user";
+import { mapGetters } from "vuex";
+import { getIsExistUser } from "@/api/system/user";
 import ExcelDownLoad from "@/components/ExcelDownLoad/index.vue";
 
 export default {
   name: "User",
-  dicts: ["sys_normal_disable", "sys_user_sex","is_can_tools"],
-  components: {Treeselect, ExcelDownLoad},
+  dicts: ["sys_normal_disable", "sys_user_sex", "is_can_tools"],
+  components: { Treeselect, ExcelDownLoad },
   data() {
     return {
-      dictLoginTools:[{value:"0",label:"允许"},{value:"1",label:"禁止"}],
+      dictLoginTools: [
+        { value: "0", label: "允许" },
+        { value: "1", label: "禁止" },
+      ],
       // 前端导出数据
       headerList: {
         用户序号: "userId",
@@ -685,7 +669,7 @@ export default {
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: {Authorization: "Bearer " + getToken()},
+        headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/system/user/importData",
       },
@@ -702,32 +686,32 @@ export default {
       },
       // 列信息
       columns: [
-        {key: 0, label: `用户编号`, visible: true},
-        {key: 1, label: `用户名称`, visible: true},
-        {key: 2, label: `用户昵称`, visible: true},
-        {key: 3, label: `部门`, visible: true},
-        {key: 4, label: `手机号码`, visible: true},
-        {key: 5, label: `状态`, visible: true},
-        {key: 6, label: `创建时间`, visible: true},
-        {key: 7, label: `租户名称`, visible: true},
+        { key: 0, label: `用户编号`, visible: true },
+        { key: 1, label: `用户名称`, visible: true },
+        { key: 2, label: `用户昵称`, visible: true },
+        { key: 3, label: `部门`, visible: true },
+        { key: 4, label: `手机号码`, visible: true },
+        { key: 5, label: `状态`, visible: true },
+        { key: 6, label: `创建时间`, visible: true },
+        { key: 7, label: `租户名称`, visible: true },
       ],
       // 表单校验
       rules: {
         userName: [
-          {required: true, message: "用户名称不能为空", trigger: "blur"},
+          { required: true, message: "用户名称不能为空", trigger: "blur" },
           {
             min: 2,
             max: 20,
             message: "用户名称长度必须介于 2 和 20 之间",
             trigger: "blur",
           },
-          {trigger: "blur", validator: this.validateNickName},
+          { trigger: "blur", validator: this.validateNickName },
         ],
         nickName: [
-          {required: true, message: "用户昵称不能为空", trigger: "blur"},
+          { required: true, message: "用户昵称不能为空", trigger: "blur" },
         ],
         password: [
-          {required: true, message: "用户密码不能为空", trigger: "blur"},
+          { required: true, message: "用户密码不能为空", trigger: "blur" },
           {
             min: 5,
             max: 20,
@@ -783,7 +767,7 @@ export default {
       //   return;
       // }
       if (value) {
-        await getIsExistUser({userName: value}).then((res) => {
+        await getIsExistUser({ userName: value }).then((res) => {
           console.log(res);
           if (res.code == 200) {
             if (res.data) {
@@ -880,7 +864,7 @@ export default {
         remark: undefined,
         postIds: [],
         roleIds: [],
-        isCanTools:undefined
+        isCanTools: undefined,
       };
       this.resetForm("form");
     },
@@ -954,13 +938,12 @@ export default {
         inputPattern: /^.{5,20}$/,
         inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
       })
-        .then(({value}) => {
+        .then(({ value }) => {
           resetUserPwd(row.userId, value).then((response) => {
             this.$modal.msgSuccess("修改成功，新密码是：" + value);
           });
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
     /** 分配角色操作 */
     handleAuthRole: function (row) {
@@ -999,8 +982,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -1036,10 +1018,10 @@ export default {
       this.$refs.upload.clearFiles();
       this.$alert(
         "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-        response.msg +
-        "</div>",
+          response.msg +
+          "</div>",
         "导入结果",
-        {dangerouslyUseHTMLString: true}
+        { dangerouslyUseHTMLString: true }
       );
       this.getList();
     },