库存盘点、以及出入库相关页面列表样式调整

src/api/inventory-management/check.js

@@ -0,0 +1,46 @@
+import request from '@/router/axios'
+
+// 库存盘点列表 
+export function checkList(data = {}) {
+  return request({
+    url: '/api/victoriatourist/checkInfo/page',
+    method: 'post',
+    data: data,
+  })
+}
+
+
+
+// 发起盘点
+export function sendCheck(data = {}) {
+  return request({
+    url: '/api/victoriatourist/checkInfo/add',
+    method: 'post',
+    data: data,
+  })
+}
+
+
+// 盘点详情
+export function checkDetails(data = {}) {
+  return request({
+    url: '/api/victoriatourist/checkDetails/list',
+    method: 'post',
+    data: data,
+  })
+}
+
+// 盘点详情
+export function getProductsByWarehouseId(data = {}) {
+  return request({
+    url: '/api/victoriatourist/stock/pageByWarehouseId',
+    method: 'post',
+    data: data,
+  })
+}
+
+
+
+
+
+

src/components/inbound-outbound/addInbound.vue

@@ -18,7 +18,7 @@
             <el-form-item label="物流单号" prop="id" v-if="inboundType === 10">
               <el-select
                 v-model="form.id"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
                 @change="handleChange"
               >
@@ -34,7 +34,7 @@
             <el-form-item label="收获仓库" prop="id" v-if="inboundType === 20">
               <el-select
                 v-model="form.id"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
                 @change="handleChangeWarehouse"
               >
@@ -84,7 +84,7 @@
                 >
                   <el-input
                     v-model="scope.row.changeQuantity"
-                    :placeholder="$t('pleaseInput')"
+                    placeholder="请输入"
                     size="mini"
                   >
                   </el-input>
@@ -118,7 +118,7 @@
                 >
                   <el-input
                     v-model="scope.row.changeQuantity"
-                    :placeholder="$t('pleaseInput')"
+                    placeholder="请输入"
                     size="mini"
                   >
                   </el-input>
@@ -141,11 +141,9 @@
       </el-form>
     </div>
     <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel"
-        >{{ $t("cancel") }}
-      </el-button>
+      <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
-        {{ $t("submit") }}</el-button
+        确定</el-button
       >
     </div>
 

src/components/inbound-outbound/addOutbound.vue

@@ -18,7 +18,7 @@
             <el-form-item label="订单类型" required>
               <el-select
                 v-model="form.orderType"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
                 disabled
               >
@@ -41,8 +41,8 @@
             <el-button
               type="text"
               @click="handleOutbound(scope.row)"
-              style="margin-top: 52px"
-              >产看订单
+              style="margin-top: 47px"
+              >查看订单
             </el-button>
           </el-col>
         </el-row>
@@ -52,7 +52,7 @@
             <el-form-item label="仓库名称" prop="warehouseId">
               <el-select
                 v-model="form.warehouseId"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
               >
                 <el-option
@@ -75,7 +75,7 @@
             <el-form-item label="出库类型" prop="type" v-if="addType !== '10'">
               <el-select
                 v-model="form.type"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
               >
                 <el-option
@@ -90,7 +90,7 @@
             <el-form-item label="补发类型" required v-if="addType === '10'">
               <el-select
                 v-model="form.orderType"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
                 disabled
               >
@@ -128,7 +128,7 @@
                 >
                   <el-input
                     v-model="scope.row.changeQuantity"
-                    :placeholder="$t('pleaseInput')"
+                    placeholder="请输入"
                     size="mini"
                     @change="(val) => handleChange(val, scope.$index)"
                   >
@@ -136,18 +136,6 @@
                 </el-form-item>
               </template>
             </el-table-column>
-
-            <!-- <el-table-column
-              :label="$t('operation')"
-              width="100"
-              align="center"
-            >
-              <template slot-scope="scope">
-                <el-button type="text" @click="deleteRow(scope.$index)">{{
-                  $t("delete")
-                }}</el-button>
-              </template>
-            </el-table-column> -->
           </el-table>
         </el-form-item>
         <div style="margin-bottom: 20px">
@@ -158,7 +146,7 @@
             <el-form-item label="物流/快递公司" prop="logisticsCompanyCode">
               <el-select
                 v-model="form.logisticsCompanyCode"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
               >
                 <el-option
@@ -183,11 +171,9 @@
       </el-form>
     </div>
     <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel"
-        >{{ $t("cancel") }}
-      </el-button>
+      <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
-        {{ $t("submit") }}</el-button
+        确定</el-button
       >
     </div>
   </div>

src/components/select-product/index.vue

@@ -2,66 +2,31 @@
   <div v-loading="loading">
     <el-table :data="tableList">
       <el-table-column
-        :label="$t('product_material.product.productType')"
+        label="产品类型"
         align="center"
         prop="type"
         :formatter="(row) => dictDataEcho(row.type, productTypeList)"
       />
+      <el-table-column label="产品编码" align="center" prop="code" />
+      <el-table-column label="产品名称" align="center" prop="name" />
+      <el-table-column label="产品单位" align="center" prop="unit" />
+      <el-table-column label="部门" align="center" prop="deptName" />
+      <el-table-column label="生命周期" align="center" prop="lifeCycle" />
       <el-table-column
-        :label="$t('product_material.product.productCode')"
-        align="center"
-        prop="code"
-      />
-      <el-table-column
-        :label="$t('product_material.product.productName')"
-        align="center"
-        prop="name"
-      />
-      <el-table-column
-        :label="$t('product_material.product.productUnit')"
-        align="center"
-        prop="unit"
-      />
-      <el-table-column
-        :label="$t('product_material.product.deptId')"
-        align="center"
-        prop="deptName"
-      />
-      <el-table-column
-        :label="$t('product_material.product.lifeCycle')"
-        align="center"
-        prop="lifeCycle"
-      />
-      <el-table-column
-        :label="$t('product_material.product.cycleSales')"
+        label="当前周期销量"
         align="center"
         prop="cycleSales"
         width="120"
       />
-      <el-table-column
-        :label="$t('product_material.product.jdPurchasePrice')"
-        align="center"
-        prop="jdPurchasePrice"
-      />
-      <el-table-column
-        :label="$t('product_material.product.sellingPrice')"
-        align="center"
-        prop="sellingPrice"
-      />
-      <el-table-column
-        :label="$t('product_material.product.purchasePrice')"
-        align="center"
-        prop="purchasePrice"
-      />
+      <el-table-column label="京东供价" align="center" prop="jdPurchasePrice" />
+      <el-table-column label="标准售价" align="center" prop="sellingPrice" />
+      <el-table-column label="标准采购价" align="center" prop="purchasePrice" />
 
-      <el-table-column :label="$t('operation')" align="center" width="80">
+      <el-table-column label="操作" align="center" width="80">
         <template slot-scope="scope">
           <el-button type="text" @click="handleSelect(scope.row)"
-            >{{ $t("select") }}
+            >选择
           </el-button>
-          <!-- <el-button type="text" @click="handleDelete(scope.row)"
-            >{{ $t("delete") }}
-          </el-button> -->
         </template>
       </el-table-column>
     </el-table>

src/views/inbound-outbound/JDoutbound/index.vue

@@ -137,7 +137,7 @@ export default {
       if (!this.form.id) {
         API.outboundAdd(this.form).then(
           () => {
-            this.msgSuccess(this.$t("addSuccess"));
+            this.msgSuccess("添加成功");
             this.$refs.addCustomer.loading = false;
             this.open = false;
             this.getList();
@@ -165,12 +165,12 @@ export default {
 
     handleDelete(row) {
       this.$confirm(this.$t("askDeleteData"), {
-        confirmButtonText: this.$t("submitText"),
-        cancelButtonText: this.$t("cancelText"),
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
         API.outboundDel({ id: row.id }).then(() => {
-          this.msgSuccess(this.$t("deleteSuccess"));
+          this.msgSuccess("删除成功");
           this.getList();
         });
       });
@@ -205,19 +205,19 @@ export default {
         "
       ></query>
       <el-table :data="tableList" v-loading="loading">
-        <el-table-column type="selection" width="50" align="center">
+        <el-table-column type="selection" width="50" align="left">
         </el-table-column>
-        <el-table-column label="订单编号" align="center" prop="code" />
-        <el-table-column label="配送中心" align="center" prop="name" />
+        <el-table-column label="订单编号" align="left" prop="code" />
+        <el-table-column label="配送中心" align="left" prop="name" />
         <el-table-column
           label="京东仓库"
-          align="center"
+          align="left"
           :formatter="showAddress"
         />
-        <el-table-column label="收货人" align="center" prop="contacts" />
-        <el-table-column label="详细地址" align="center" prop="phone" />
+        <el-table-column label="收货人" align="left" prop="contacts" />
+        <el-table-column label="详细地址" align="left" prop="phone" />
 
-        <el-table-column :label="$t('operation')" align="center" width="120">
+        <el-table-column label="操作" align="left" width="120">
           <template slot-scope="scope">
             <el-button type="text" @click="handleEdit(scope.row)"
               >{{ $t("edit") }}

src/views/inbound-outbound/abnormalManage/addInspection.vue

@@ -20,7 +20,7 @@
             <el-form-item label="跟进人" prop="code">
               <el-select
                 v-model="form.inWarehouseId"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
               >
                 <el-option
@@ -40,7 +40,7 @@
               <el-date-picker
                 v-model="form.clearancePeriod"
                 type="datetime"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 value-format="yyyy-MM-dd HH:mm:ss"
               >
               </el-date-picker>
@@ -59,15 +59,13 @@
       </el-form>
     </div>
     <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel"
-        >{{ $t("cancel") }}
-      </el-button>
+      <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
-        {{ $t("submit") }}</el-button
+        确定</el-button
       >
     </div>
     <!-- <el-dialog
-      :title="$t('goodsSelect')"
+      title="物品选择"
       v-if="selectDialog"
       :visible.sync="selectDialog"
       width="80%"
@@ -167,7 +165,7 @@ export default {
     },
     deleteRow(index) {
       this.form.changeProductList.splice(index, 1);
-      this.msgSuccess(this.$t("deleteSuccess"));
+      this.msgSuccess("删除成功");
     },
   },
 };

src/views/inbound-outbound/abnormalManage/index.vue

@@ -126,7 +126,7 @@ export default {
     handleSubmit() {
       API.addInspection(this.form).then(
         () => {
-          this.msgSuccess(this.$t("addSuccess"));
+          this.msgSuccess("添加成功");
           this.$refs.addInspection.loading = false;
           this.open = false;
           this.getList();
@@ -140,8 +140,8 @@ export default {
     handleReceive(row) {
       this.open = true;
       // this.$confirm("是否确认接收 ?", {
-      //   confirmButtonText: this.$t("submitText"),
-      //   cancelButtonText: this.$t("cancelText"),
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
       //   type: "warning",
       // }).then(() => {
       //   API.receive({ id: row.id, inQuantity: row.outQuantity }).then(() => {
@@ -205,7 +205,7 @@ export default {
           width="160"
         />
 
-        <el-table-column label="操作" align="center" width="120">
+        <el-table-column label="操作" align="left" width="120">
           <template slot-scope="scope">
             <el-button type="text" @click="handleReceive(scope.row)"
               >跟进

src/views/inbound-outbound/arrivalInspection/addInspection.vue

@@ -54,7 +54,7 @@
                 >
                   <el-input
                     v-model="scope.row.quantity"
-                    :placeholder="$t('pleaseInput')"
+                    placeholder="请输入"
                     size="mini"
                   >
                   </el-input>
@@ -71,7 +71,7 @@
                 >
                   <el-input
                     v-model="scope.row.quantity"
-                    :placeholder="$t('pleaseInput')"
+                    placeholder="请输入"
                     size="mini"
                   >
                   </el-input>
@@ -80,14 +80,12 @@
             </el-table-column>
 
             <!-- <el-table-column
-              :label="$t('operation')"
+              label="操作"
               width="100"
-              align="center"
+              align="left"
             >
               <template slot-scope="scope">
-                <el-button type="text" @click="deleteRow(scope.$index)">{{
-                  $t("delete")
-                }}</el-button>
+                <el-button type="text" @click="deleteRow(scope.$index)">删除</el-button>
               </template>
             </el-table-column> -->
           </el-table>
@@ -95,15 +93,13 @@
       </el-form>
     </div>
     <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel"
-        >{{ $t("cancel") }}
-      </el-button>
+      <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
-        {{ $t("submit") }}</el-button
+        确定</el-button
       >
     </div>
     <!-- <el-dialog
-      :title="$t('goodsSelect')"
+      title="物品选择"
       v-if="selectDialog"
       :visible.sync="selectDialog"
       width="80%"
@@ -203,7 +199,7 @@ export default {
     },
     deleteRow(index) {
       this.form.changeProductList.splice(index, 1);
-      this.msgSuccess(this.$t("deleteSuccess"));
+      this.msgSuccess("删除成功");
     },
   },
 };

src/views/inbound-outbound/arrivalInspection/index.vue

@@ -121,7 +121,7 @@ export default {
     handleSubmit() {
       API.addInspection(this.form).then(
         () => {
-          this.msgSuccess(this.$t("addSuccess"));
+          this.msgSuccess("添加成功");
           this.$refs.addInspection.loading = false;
           this.open = false;
           this.getList();
@@ -135,8 +135,8 @@ export default {
     handleReceive(row) {
       this.open = true;
       // this.$confirm("是否确认接收 ?", {
-      //   confirmButtonText: this.$t("submitText"),
-      //   cancelButtonText: this.$t("cancelText"),
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
       //   type: "warning",
       // }).then(() => {
       //   API.receive({ id: row.id, inQuantity: row.outQuantity }).then(() => {
@@ -173,24 +173,20 @@ export default {
         "
       ></query>
       <el-table :data="tableList" v-loading="loading">
-        <el-table-column label="采购单号" align="center" prop="code" />
-        <el-table-column label="供应商" align="center" prop="name" />
-        <el-table-column label="物流公司" align="center" prop="specs" />
+        <el-table-column label="采购单号" align="left" prop="code" />
+        <el-table-column label="供应商" align="left" prop="name" />
+        <el-table-column label="物流公司" align="left" prop="specs" />
         <el-table-column
           label="物流/快递单号"
-          align="center"
+          align="left"
           prop="outWarehouseName"
         />
-        <el-table-column label="采购员" align="center" prop="outQuantity" />
-        <el-table-column label="采购时间" align="center" prop="outUserName" />
-        <el-table-column
-          label="调入仓库"
-          align="center"
-          prop="inWarehouseName"
-        />
-        <el-table-column label="状态" align="center" prop="inQuantity" />
+        <el-table-column label="采购员" align="left" prop="outQuantity" />
+        <el-table-column label="采购时间" align="left" prop="outUserName" />
+        <el-table-column label="调入仓库" align="left" prop="inWarehouseName" />
+        <el-table-column label="状态" align="left" prop="inQuantity" />
 
-        <el-table-column :label="$t('operation')" align="center" width="120">
+        <el-table-column label="操作" align="left" width="120">
           <template slot-scope="scope">
             <el-button type="text" @click="handleReceive(scope.row)"
               >质检

src/views/inbound-outbound/inbound/addInbound.vue

@@ -18,7 +18,7 @@
             <el-form-item label="物流单号" prop="id" v-if="inboundType === 10">
               <el-select
                 v-model="form.id"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
                 @change="handleChange"
               >
@@ -34,7 +34,7 @@
             <el-form-item label="收获仓库" prop="id" v-if="inboundType === 20">
               <el-select
                 v-model="form.id"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
                 @change="handleChangeWarehouse"
               >
@@ -84,7 +84,7 @@
                 >
                   <el-input
                     v-model="scope.row.changeQuantity"
-                    :placeholder="$t('pleaseInput')"
+                    placeholder="请输入"
                     size="mini"
                   >
                   </el-input>
@@ -118,22 +118,18 @@
                 >
                   <el-input
                     v-model="scope.row.changeQuantity"
-                    :placeholder="$t('pleaseInput')"
+                    placeholder="请输入"
                     size="mini"
                   >
                   </el-input>
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column
-              :label="$t('operation')"
-              width="100"
-              align="center"
-            >
+            <el-table-column label="操作" width="100" align="left">
               <template slot-scope="scope">
-                <el-button type="text" @click="deleteRow(scope.$index)">{{
-                  $t("delete")
-                }}</el-button>
+                <el-button type="text" @click="deleteRow(scope.$index)"
+                  >删除</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
@@ -141,16 +137,14 @@
       </el-form>
     </div>
     <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel"
-        >{{ $t("cancel") }}
-      </el-button>
+      <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
-        {{ $t("submit") }}</el-button
+        确定</el-button
       >
     </div>
 
     <el-dialog
-      :title="$t('goodsSelect')"
+      title="物品选择"
       v-if="selectDialog"
       :visible.sync="selectDialog"
       width="80%"
@@ -320,7 +314,7 @@ export default {
     },
     deleteRow(index) {
       this.form.changeDetailsList.splice(index, 1);
-      this.msgSuccess(this.$t("deleteSuccess"));
+      this.msgSuccess("删除成功");
     },
   },
 };

src/views/inbound-outbound/inbound/cgInbound/index.vue

@@ -159,7 +159,7 @@ export default {
       // } else {
       //   API.manualAdd(this.form).then(
       //     () => {
-      //       this.msgSuccess(this.$t("addSuccess"));
+      //       this.msgSuccess('添加成功');
       //       this.open = false;
       //       this.$refs.purchaseInbound.loading = false;
       //       this.getList();
@@ -172,18 +172,6 @@ export default {
       // }
     },
 
-    handleDelete(row) {
-      this.$confirm(this.$t("askDeleteData"), {
-        confirmButtonText: this.$t("submitText"),
-        cancelButtonText: this.$t("cancelText"),
-        type: "warning",
-      }).then(() => {
-        API.outboundDel({ id: row.id }).then(() => {
-          this.msgSuccess(this.$t("deleteSuccess"));
-          this.getList();
-        });
-      });
-    },
     showAddress(row) {
       return (
         <div>
@@ -225,7 +213,7 @@ export default {
           label="物流公司"
           align="left"
           prop="logisticsCompanyName"
-          width="100"
+          width="120"
         />
         <el-table-column
           label="物流/快递单号"
@@ -254,7 +242,7 @@ export default {
             (row) => (row.inStockStatus === 10 ? '未入库' : '部分入库')
           "
         />
-        <el-table-column label="操作" align="center" width="100">
+        <el-table-column label="操作" align="left" width="100">
           <template slot-scope="scope">
             <el-button type="text" @click="handleInbound(scope.row)">
               入库

src/views/inbound-outbound/inbound/cgInbound/purchaseInbound.vue

@@ -59,7 +59,7 @@
                 >
                   <el-input
                     v-model="scope.row.changeQuantity"
-                    :placeholder="$t('pleaseInput')"
+                    placeholder="请输入"
                     size="mini"
                   >
                   </el-input>
@@ -221,7 +221,7 @@ export default {
     },
     deleteRow(index) {
       this.form.changeDetailsList.splice(index, 1);
-      this.msgSuccess(this.$t("deleteSuccess"));
+      this.msgSuccess("删除成功");
     },
   },
 };

src/views/inbound-outbound/inbound/index.vue

@@ -161,7 +161,7 @@ export default {
       if (this.inboundType === 10) {
         API.purchaseAdd(this.form).then(
           () => {
-            this.msgSuccess(this.$t("addSuccess"));
+            this.msgSuccess("添加成功");
             this.$refs.addInbound.loading = false;
             this.open = false;
             this.getList();
@@ -174,7 +174,7 @@ export default {
       } else {
         API.manualAdd(this.form).then(
           () => {
-            this.msgSuccess(this.$t("addSuccess"));
+            this.msgSuccess("添加成功");
             this.open = false;
             this.$refs.addInbound.loading = false;
             this.getList();
@@ -189,12 +189,12 @@ export default {
 
     handleDelete(row) {
       this.$confirm(this.$t("askDeleteData"), {
-        confirmButtonText: this.$t("submitText"),
-        cancelButtonText: this.$t("cancelText"),
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
         API.outboundDel({ id: row.id }).then(() => {
-          this.msgSuccess(this.$t("deleteSuccess"));
+          this.msgSuccess("删除成功");
           this.getList();
         });
       });
@@ -231,47 +231,47 @@ export default {
       <el-table :data="tableList" v-loading="loading">
         <el-table-column
           :label="$t('inbound_outbound.outbound.outboundOddNumbers')"
-          align="center"
+          align="left"
           prop="code"
         />
         <el-table-column
           :label="$t('inbound_outbound.outbound.salesOddNumbers')"
-          align="center"
+          align="left"
           prop="name"
         />
         <el-table-column
           :label="$t('inbound_outbound.outbound.customerType')"
-          align="center"
+          align="left"
           :formatter="showAddress"
         />
         <el-table-column
           :label="$t('inbound_outbound.outbound.customerCode')"
-          align="center"
+          align="left"
           prop="contacts"
         />
         <el-table-column
           :label="$t('inbound_outbound.outbound.customerNmae')"
-          align="center"
+          align="left"
           prop="phone"
         />
         <el-table-column
           :label="$t('inbound_outbound.outbound.outboundQuantity')"
-          align="center"
+          align="left"
           prop="phone"
         />
         <el-table-column
           :label="$t('inbound_outbound.outbound.createTime')"
-          align="center"
+          align="left"
           prop="phone"
         />
 
         <el-table-column
           :label="$t('inbound_outbound.outbound.remarks')"
-          align="center"
+          align="left"
           prop="phone"
         />
 
-        <el-table-column :label="$t('operation')" align="center" width="120">
+        <el-table-column label="操作" align="left" width="120">
           <template slot-scope="scope">
             <el-button type="text" @click="handleEdit(scope.row)"
               >{{ $t("edit") }}

src/views/inbound-outbound/inbound/manualInbound/addManualInbound.vue

@@ -13,7 +13,7 @@
             <el-form-item label="仓库名称" prop="warehouseId">
               <el-select
                 v-model="form.warehouseId"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
                 @change="handleChangeWarehouse"
               >
@@ -73,14 +73,14 @@
                 >
                   <el-input
                     v-model="scope.row.quantity"
-                    :placeholder="$t('pleaseInput')"
+                    placeholder="请输入"
                     size="mini"
                   >
                   </el-input>
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="100" align="center">
+            <el-table-column label="操作" width="100" align="left">
               <template slot-scope="scope">
                 <el-button type="text" @click="deleteRow(scope.$index)">
                   删除

src/views/inbound-outbound/inbound/manualInbound/index.vue

@@ -122,13 +122,6 @@ export default {
         }
       );
     },
-    showAddress(row) {
-      return (
-        <div>
-          {row.countryName} , {row.provinceName} , {row.cityName}
-        </div>
-      );
-    },
   },
 };
 </script>

src/views/inbound-outbound/inbound/qualityTesting.vue

@@ -84,14 +84,14 @@ export default {
           align: "center",
           list: [
             {
-              name: this.$t("cancelText"),
+              name: "取消",
               methodsText: "cancel",
               cancel: () => {
                 this.open = false;
               },
             },
             {
-              name: this.$t("submitText"),
+              name: "确定",
               methodsText: "submit",
               type: "primary",
               submit: () => {
@@ -205,7 +205,7 @@ export default {
       // if (this.inboundType === 10) {
       //   API.purchaseAdd(this.form).then(
       //     () => {
-      //       this.msgSuccess(this.$t("addSuccess"));
+      //       this.msgSuccess('添加成功');
       //       this.$refs.addInbound.loading = false;
       //       this.open = false;
       //       this.getList();
@@ -218,7 +218,7 @@ export default {
       // } else {
       //   API.manualAdd(this.form).then(
       //     () => {
-      //       this.msgSuccess(this.$t("addSuccess"));
+      //       this.msgSuccess('添加成功');
       //       this.open = false;
       //       this.$refs.addInbound.loading = false;
       //       this.getList();
@@ -233,12 +233,12 @@ export default {
 
     handleDelete(row) {
       this.$confirm(this.$t("askDeleteData"), {
-        confirmButtonText: this.$t("submitText"),
-        cancelButtonText: this.$t("cancelText"),
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
         API.outboundDel({ id: row.id }).then(() => {
-          this.msgSuccess(this.$t("deleteSuccess"));
+          this.msgSuccess("删除成功");
           this.getList();
         });
       });
@@ -273,20 +273,20 @@ export default {
         "
       ></query>
       <el-table :data="tableList" v-loading="loading">
-        <el-table-column label="申购单号" align="center" prop="code" />
-        <el-table-column label="物品编码" align="center" prop="name" />
-        <el-table-column label="物品名称" align="center" />
-        <el-table-column label="到货数量" align="center" prop="contacts" />
-        <el-table-column label="到货数量" align="center" prop="phone" />
-        <el-table-column label="到货日期" align="center" prop="phone" />
-        <el-table-column label="收获仓库" align="center" prop="phone" />
-        <el-table-column label="入库类型" align="center" prop="phone" />
-        <el-table-column label="质检人" align="center" prop="phone" />
-        <el-table-column label="质检日期" align="center" prop="phone" />
-        <el-table-column label="质检数量" align="center" prop="phone" />
-        <el-table-column label="质检结论" align="center" prop="phone" />
-        <el-table-column label="质检说明" align="center" prop="phone" />
-        <el-table-column :label="$t('operation')" align="center" width="100">
+        <el-table-column label="申购单号" align="left" prop="code" />
+        <el-table-column label="物品编码" align="left" prop="name" />
+        <el-table-column label="物品名称" align="left" />
+        <el-table-column label="到货数量" align="left" prop="contacts" />
+        <el-table-column label="到货数量" align="left" prop="phone" />
+        <el-table-column label="到货日期" align="left" prop="phone" />
+        <el-table-column label="收获仓库" align="left" prop="phone" />
+        <el-table-column label="入库类型" align="left" prop="phone" />
+        <el-table-column label="质检人" align="left" prop="phone" />
+        <el-table-column label="质检日期" align="left" prop="phone" />
+        <el-table-column label="质检数量" align="left" prop="phone" />
+        <el-table-column label="质检结论" align="left" prop="phone" />
+        <el-table-column label="质检说明" align="left" prop="phone" />
+        <el-table-column label="操作" align="left" width="100">
           <template slot-scope="scope">
             <el-button type="text" @click="startQuality(scope.row)">
               开始质检

src/views/inbound-outbound/outbound/addOutbound.vue

@@ -13,7 +13,7 @@
             <el-form-item label="销售订单" prop="receiptWarehouseId">
               <el-select
                 v-model="form.receiptWarehouseId"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
               >
                 <el-option
@@ -37,7 +37,7 @@
               <el-date-picker
                 v-model="form.planArrivalTime"
                 type="datetime"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 style="width: 100%"
               >
@@ -54,7 +54,7 @@
             >
               <el-input
                 v-model="form.cause"
-                :placeholder="$t('pleaseInput')"
+                placeholder="请输入"
                 type="textarea"
                 rows="4"
               ></el-input>
@@ -110,15 +110,11 @@
               </template>
             </el-table-column>
 
-            <el-table-column
-              :label="$t('operation')"
-              width="100"
-              align="center"
-            >
+            <el-table-column label="操作" width="100" align="left">
               <template slot-scope="scope">
-                <el-button type="text" @click="deleteRow(scope.$index)">{{
-                  $t("delete")
-                }}</el-button>
+                <el-button type="text" @click="deleteRow(scope.$index)"
+                  >删除</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
@@ -126,11 +122,9 @@
       </el-form>
     </div>
     <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel"
-        >{{ $t("cancel") }}
-      </el-button>
+      <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
-        {{ $t("submit") }}</el-button
+        确定</el-button
       >
     </div>
   </div>

src/views/inbound-outbound/outbound/index.vue

@@ -132,7 +132,7 @@ export default {
       if (!this.form.id) {
         API.outboundAdd(this.form).then(
           () => {
-            this.msgSuccess(this.$t("addSuccess"));
+            this.msgSuccess("添加成功");
             this.$refs.addCustomer.loading = false;
             this.open = false;
             this.getList();
@@ -160,12 +160,12 @@ export default {
 
     handleDelete(row) {
       this.$confirm(this.$t("askDeleteData"), {
-        confirmButtonText: this.$t("submitText"),
-        cancelButtonText: this.$t("cancelText"),
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
         API.outboundDel({ id: row.id }).then(() => {
-          this.msgSuccess(this.$t("deleteSuccess"));
+          this.msgSuccess("删除成功");
           this.getList();
         });
       });
@@ -202,47 +202,47 @@ export default {
       <el-table :data="tableList" v-loading="loading">
         <el-table-column
           :label="$t('inbound_outbound.outbound.outboundOddNumbers')"
-          align="center"
+          align="left"
           prop="code"
         />
         <el-table-column
           :label="$t('inbound_outbound.outbound.salesOddNumbers')"
-          align="center"
+          align="left"
           prop="name"
         />
         <el-table-column
           :label="$t('inbound_outbound.outbound.customerType')"
-          align="center"
+          align="left"
           :formatter="showAddress"
         />
         <el-table-column
           :label="$t('inbound_outbound.outbound.customerCode')"
-          align="center"
+          align="left"
           prop="contacts"
         />
         <el-table-column
           :label="$t('inbound_outbound.outbound.customerNmae')"
-          align="center"
+          align="left"
           prop="phone"
         />
         <el-table-column
           :label="$t('inbound_outbound.outbound.outboundQuantity')"
-          align="center"
+          align="left"
           prop="phone"
         />
         <el-table-column
           :label="$t('inbound_outbound.outbound.createTime')"
-          align="center"
+          align="left"
           prop="phone"
         />
 
         <el-table-column
           :label="$t('inbound_outbound.outbound.remarks')"
-          align="center"
+          align="left"
           prop="phone"
         />
 
-        <el-table-column :label="$t('operation')" align="center" width="120">
+        <el-table-column label="操作" align="left" width="120">
           <template slot-scope="scope">
             <el-button type="text" @click="handleEdit(scope.row)"
               >{{ $t("edit") }}

src/views/inbound-outbound/outbound/manualOutbound/addManualOutbound.vue

@@ -8,12 +8,12 @@
         :rules="formRules"
         label-width="100px"
       >
-        <el-row>
+        <el-row :gutter="10">
           <el-col :span="6">
             <el-form-item label="仓库名称" prop="warehouseId">
               <el-select
                 v-model="form.warehouseId"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
               >
                 <el-option
@@ -32,6 +32,23 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="出库类型" prop="type">
+              <el-select
+                v-model="form.type"
+                placeholder="请选择"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in outboundTypeList"
+                  :key="item.id"
+                  :label="item.dictValue"
+                  :value="item.dictKey"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <div style="margin-bottom: 20px">
@@ -60,7 +77,7 @@
                 >
                   <el-input
                     v-model="scope.row.quantity"
-                    :placeholder="$t('pleaseInput')"
+                    placeholder="请输入"
                     size="mini"
                   >
                   </el-input>
@@ -68,15 +85,11 @@
               </template>
             </el-table-column>
 
-            <el-table-column
-              :label="$t('operation')"
-              width="100"
-              align="center"
-            >
+            <el-table-column label="操作" width="100" align="left">
               <template slot-scope="scope">
-                <el-button type="text" @click="deleteRow(scope.$index)">{{
-                  $t("delete")
-                }}</el-button>
+                <el-button type="text" @click="deleteRow(scope.$index)"
+                  >删除</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
@@ -84,15 +97,13 @@
       </el-form>
     </div>
     <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel"
-        >{{ $t("cancel") }}
-      </el-button>
+      <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
-        {{ $t("submit") }}</el-button
+        确定</el-button
       >
     </div>
     <el-dialog
-      :title="$t('goodsSelect')"
+      title="物品选择"
       v-if="selectDialog"
       :visible.sync="selectDialog"
       width="80%"
@@ -125,6 +136,10 @@ export default {
       type: Array,
       default: () => [],
     },
+    outboundTypeList: {
+      type: Array,
+      default: () => [],
+    },
   },
   data() {
     return {
@@ -149,6 +164,13 @@ export default {
             trigger: "change",
           },
         ],
+        type: [
+          {
+            required: true,
+            message: "请选择出库类型",
+            trigger: "change",
+          },
+        ],
       },
     };
   },
@@ -186,7 +208,7 @@ export default {
     },
     deleteRow(index) {
       this.form.changeProductList.splice(index, 1);
-      this.msgSuccess(this.$t("deleteSuccess"));
+      this.msgSuccess("删除成功");
     },
   },
 };

src/views/inbound-outbound/outbound/manualOutbound/index.vue

@@ -19,6 +19,7 @@ export default {
     return {
       warehouseSelectList: [],
       warehouseTypeList: [],
+      outboundTypeList: [],
       btnForm: {
         otherButton: {
           list: [
@@ -71,6 +72,9 @@ export default {
     this.warehouseTypeList = businessDictData.find(
       (item) => item.code === "warehouseType"
     ).children;
+    this.outboundTypeList = businessDictData.find(
+      (item) => item.code === "outboundType"
+    ).children;
     warehouseSelectList().then((res) => {
       this.warehouseSelectList = res.data.data;
       this.selectConfig[0].data = this.warehouseSelectList.map((item) => ({
@@ -108,19 +112,13 @@ export default {
       this.open = true;
     },
     handleCancel() {
-      this.form = {
-        warehouseId: "",
-        remarks: "",
-        type: "",
-        changeProductList: [],
-      };
       this.open = false;
     },
 
     handleSubmit() {
       API.manualOutbound(this.form).then(
         () => {
-          this.msgSuccess(this.$t("addSuccess"));
+          this.msgSuccess("添加成功");
           this.$refs.addManualOutbound.loading = false;
           this.open = false;
           this.getList();
@@ -162,14 +160,34 @@ export default {
         "
       ></query>
       <el-table :data="tableList" v-loading="loading">
-        <el-table-column label="仓库名称" align="center" prop="code" />
-        <el-table-column label="物品编码" align="center" />
-        <el-table-column label="物品名称" align="center" prop="contacts" />
-        <el-table-column label="规格" align="center" prop="phone" />
-        <el-table-column label="单位" align="center" prop="phone" />
-        <el-table-column label="入库数量" align="center" prop="phone" />
-        <el-table-column label="操作人" align="center" prop="phone" />
-        <el-table-column label="操作时间" align="center" prop="phone" />
+        <el-table-column label="仓库名称" align="left" />
+        <el-table-column
+          label="物品编码"
+          align="left"
+          prop="code"
+          width="150"
+        />
+        <el-table-column label="物品名称" align="left" prop="name" />
+        <el-table-column label="规格" align="left" prop="spec" width="130" />
+        <el-table-column label="单位" align="left" prop="unit" width="100" />
+        <el-table-column
+          label="出库数量"
+          align="left"
+          prop="changeQuantity"
+          width="120"
+        />
+        <el-table-column
+          label="操作人"
+          align="left"
+          prop="createUserName"
+          width="100"
+        />
+        <el-table-column
+          label="操作时间"
+          align="left"
+          prop="createTime"
+          width="150"
+        />
       </el-table>
       <pagination
         v-show="total > 0"
@@ -191,6 +209,7 @@ export default {
         :form="form"
         :warehouseSelectList="warehouseSelectList"
         :warehouseTypeList="warehouseTypeList"
+        :outboundTypeList="outboundTypeList"
         @submit="handleSubmit"
         @cancel="handleCancel"
         ref="addManualOutbound"

src/views/inbound-outbound/outbound/salesOutbound/addOutbound.vue

@@ -13,7 +13,7 @@
             <el-form-item label="销售订单" prop="receiptWarehouseId">
               <el-select
                 v-model="form.receiptWarehouseId"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
               >
                 <el-option
@@ -37,7 +37,7 @@
               <el-date-picker
                 v-model="form.planArrivalTime"
                 type="datetime"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 style="width: 100%"
               >
@@ -54,7 +54,7 @@
             >
               <el-input
                 v-model="form.cause"
-                :placeholder="$t('pleaseInput')"
+                placeholder="请输入"
                 type="textarea"
                 rows="4"
               ></el-input>
@@ -110,15 +110,11 @@
               </template>
             </el-table-column>
 
-            <el-table-column
-              :label="$t('operation')"
-              width="100"
-              align="center"
-            >
+            <el-table-column label="操作" width="100" align="left">
               <template slot-scope="scope">
-                <el-button type="text" @click="deleteRow(scope.$index)">{{
-                  $t("delete")
-                }}</el-button>
+                <el-button type="text" @click="deleteRow(scope.$index)"
+                  >删除</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
@@ -126,11 +122,9 @@
       </el-form>
     </div>
     <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel"
-        >{{ $t("cancel") }}
-      </el-button>
+      <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
-        {{ $t("submit") }}</el-button
+        确定</el-button
       >
     </div>
   </div>

src/views/inbound-outbound/outbound/salesOutbound/index.vue

@@ -117,6 +117,7 @@ export default {
             this.form = {
               customerName: row.customerName,
               orderType: String(row.type),
+              orderCode: row.code,
               type: "",
               orderId: row.id,
               warehouseId: "",
@@ -146,7 +147,7 @@ export default {
     handleSubmit() {
       API.salesOutbound(this.form).then(
         () => {
-          this.msgSuccess(this.$t("addSuccess"));
+          this.msgSuccess("添加成功");
           this.$refs.addOutbound.loading = false;
           this.open = false;
           this.getList();
@@ -161,7 +162,8 @@ export default {
     showAddress(row) {
       return (
         <div>
-          {row.countryName} , {row.provinceName} , {row.cityName}
+          {row.countryName} , {row.provinceName} , {row.cityName} ,
+          {row.detailedAddress}
         </div>
       );
     },
@@ -194,26 +196,38 @@ export default {
       <el-table :data="tableList" v-loading="loading">
         <el-table-column
           label="订单类型"
-          align="center"
+          align="left"
           prop="type"
+          width="120"
           :formatter="(row) => dictDataEcho(row.type, orderTypeList)"
         />
-        <el-table-column label="订单编号" align="center" prop="code" />
-        <el-table-column label="客户名称" align="center" prop="customerName" />
+        <el-table-column
+          label="订单编号"
+          align="left"
+          prop="code"
+          width="150"
+        />
+        <el-table-column label="客户名称" align="left" prop="customerName" />
         <el-table-column
           label="收件地址"
-          align="center"
+          align="left"
           :formatter="showAddress"
         />
-        <el-table-column label="下单时间" align="center" prop="orderTime" />
+        <el-table-column
+          label="下单时间"
+          align="left"
+          prop="orderTime"
+          width="160"
+        />
         <el-table-column
           label="状态"
-          align="center"
+          align="left"
           prop="issueStatus"
+          width="100"
           :formatter="showOutboundStatus"
         />
 
-        <el-table-column :label="$t('operation')" align="center" width="120">
+        <el-table-column label="操作" align="center" width="120">
           <template slot-scope="scope">
             <el-button type="text" @click="handleOutbound(scope.row)"
               >出库

src/views/inbound-outbound/transfer/index.vue

@@ -61,7 +61,7 @@ export default {
       tableList: [],
       total: 0,
       loading: false,
-      titleText: "手动出库",
+      titleText: "发起调仓",
       open: false,
       form: {
         outWarehouseId: "",
@@ -131,7 +131,7 @@ export default {
     handleSubmit() {
       API.sendTransfer(this.form).then(
         () => {
-          this.msgSuccess(this.$t("addSuccess"));
+          this.msgSuccess("添加成功");
           this.$refs.sendTransfer.loading = false;
           this.open = false;
           this.getList();
@@ -144,8 +144,8 @@ export default {
     },
     handleReceive(row) {
       this.$confirm("是否确认接收 ?", {
-        confirmButtonText: this.$t("submitText"),
-        cancelButtonText: this.$t("cancelText"),
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
         API.receive({ id: row.id, inQuantity: row.outQuantity }).then(() => {
@@ -185,27 +185,55 @@ export default {
         "
       ></query>
       <el-table :data="tableList" v-loading="loading">
-        <el-table-column label="物品编码" align="center" prop="code" />
-        <el-table-column label="物品名称" align="center" prop="name" />
-        <el-table-column label="规格" align="center" prop="specs" />
+        <el-table-column
+          label="物品编码"
+          align="left"
+          prop="code"
+          width="150"
+        />
+        <el-table-column label="物品名称" align="left" prop="name" />
+        <el-table-column label="规格" align="left" prop="specs" />
         <el-table-column
           label="调出仓库"
-          align="center"
+          align="left"
           prop="outWarehouseName"
+          width="150"
+        />
+        <el-table-column
+          label="调出数量"
+          align="left"
+          prop="outQuantity"
+          width="110"
+        />
+        <el-table-column
+          label="操作人"
+          align="left"
+          prop="outUserName"
+          width="120"
         />
-        <el-table-column label="调出数量" align="center" prop="outQuantity" />
-        <el-table-column label="操作人" align="center" prop="outUserName" />
         <el-table-column
           label="调入仓库"
-          align="center"
+          align="left"
           prop="inWarehouseName"
+          width="150"
+        />
+        <el-table-column
+          label="接收数量"
+          align="left"
+          prop="inQuantity"
+          width="120"
+        />
+        <el-table-column
+          label="接收人"
+          align="left"
+          prop="inUserName"
+          width="120"
         />
-        <el-table-column label="接收数量" align="center" prop="inQuantity" />
-        <el-table-column label="接收人" align="center" prop="inUserName" />
         <el-table-column
           label="状态"
-          align="center"
+          align="left"
           prop="inStatus"
+          width="100"
           :formatter="
             (row) => {
               if (row.inStatus === 0) {
@@ -216,7 +244,7 @@ export default {
             }
           "
         />
-        <el-table-column :label="$t('operation')" align="center" width="120">
+        <el-table-column label="操作" align="center" width="120">
           <template slot-scope="scope">
             <el-button
               type="text"

src/views/inbound-outbound/transfer/sendTransfer.vue

@@ -13,7 +13,7 @@
             <el-form-item label="调出仓库" prop="outWarehouseId">
               <el-select
                 v-model="form.outWarehouseId"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
               >
                 <el-option
@@ -36,7 +36,7 @@
             <el-form-item label="调入仓库" prop="inWarehouseId">
               <el-select
                 v-model="form.inWarehouseId"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
               >
                 <el-option
@@ -95,7 +95,7 @@
                 >
                   <el-input
                     v-model="scope.row.quantity"
-                    :placeholder="$t('pleaseInput')"
+                    placeholder="请输入"
                     size="mini"
                   >
                   </el-input>
@@ -103,15 +103,11 @@
               </template>
             </el-table-column>
 
-            <el-table-column
-              :label="$t('operation')"
-              width="100"
-              align="center"
-            >
+            <el-table-column label="操作" width="100" align="left">
               <template slot-scope="scope">
-                <el-button type="text" @click="deleteRow(scope.$index)">{{
-                  $t("delete")
-                }}</el-button>
+                <el-button type="text" @click="deleteRow(scope.$index)"
+                  >删除</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
@@ -119,15 +115,13 @@
       </el-form>
     </div>
     <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel"
-        >{{ $t("cancel") }}
-      </el-button>
+      <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
-        {{ $t("submit") }}</el-button
+        确定</el-button
       >
     </div>
     <el-dialog
-      :title="$t('goodsSelect')"
+      title="物品选择"
       v-if="selectDialog"
       :visible.sync="selectDialog"
       width="80%"
@@ -231,7 +225,7 @@ export default {
     },
     deleteRow(index) {
       this.form.changeProductList.splice(index, 1);
-      this.msgSuccess(this.$t("deleteSuccess"));
+      this.msgSuccess("删除成功");
     },
   },
 };

src/views/inventory-management/check/index.vue

@@ -4,7 +4,7 @@
 import test from "@/components/form-test/index.vue";
 import query from "@/components/query/index.vue";
 import sendCheck from "./sendCheck.vue";
-import * as API from "@/api/inbound-outbound/inbound/index.js";
+import * as API from "@/api/inventory-management/check.js";
 import { warehouseSelectList } from "@/api/product-material/warehouse/index.js";
 
 export default {
@@ -17,6 +17,7 @@ export default {
     return {
       warehouseTypeList: [],
       warehouseSelectList: [],
+      productTypeList: [],
       btnForm: {
         otherButton: {
           list: [
@@ -35,39 +36,39 @@ export default {
         pageNum: 1,
         pageSize: 10,
         keyword: "",
-        warehouseId: "",
-        status: "",
+        warehouseType: "",
+        resultType: "",
         code: "",
-        goodsCode: "",
-        goodsName: "",
-        applyUserId: "",
-        startTime: "",
+        warehouseName: "",
+        createUser: "",
+        beginTime: "",
         endTime: "",
       },
       selectConfig: [
         {
           label: "仓库类型",
-          prop: "type",
+          prop: "warehouseType",
           data: [],
         },
         {
           label: "盘点结论",
-          prop: "type",
+          prop: "resultType",
           data: [
-            { label: "正常", value: "1" },
-            { label: "异常", value: "2" },
+            { label: "正常", value: "0" },
+            { label: "异常", value: "1" },
           ],
         },
       ],
       tableList: [],
       loading: false,
-      inboundType: 10, // 入库类型  10 采购入库  20 手动入库
       titleText: "",
       open: false,
       form: {
-        id: "",
-        changeDetailsList: [],
+        warehouseId: "",
+        checkDetailsList: [],
       },
+      checkDetailsList: [],
+      openDetails: false,
     };
   },
   created() {
@@ -81,15 +82,18 @@ export default {
       label: item.dictValue,
       value: item.dictKey,
     }));
+    this.productTypeList = businessDictData.find(
+      (item) => item.code === "productType"
+    ).children;
     warehouseSelectList().then((res) => {
       this.warehouseSelectList = res.data.data;
     });
-    // this.getList();
+    this.getList();
   },
   methods: {
     getList() {
       this.loading = true;
-      API.outboundList(this.queryParams).then(
+      API.checkList(this.queryParams).then(
         (res) => {
           console.log(res, "qq");
           this.tableList = res.data.data.records;
@@ -97,7 +101,7 @@ export default {
           this.loading = false;
         },
         (err) => {
-          console.log("outboundList: " + err);
+          console.log("checkList: " + err);
           this.loading = false;
         }
       );
@@ -107,61 +111,38 @@ export default {
     },
     handleSend() {
       this.form = {
-        id: "",
-        changeDetailsList: [],
+        warehouseId: "",
+        checkDetailsList: [],
       };
       this.open = true;
     },
     handleCancel() {
-      this.form = {
-        id: "",
-        changeDetailsList: [],
-      };
       this.open = false;
     },
-    handleEdit(row) {
-      this.titleText = "edit";
-      this.form = row;
-      this.open = true;
-      if (this.form.fileInfoList === "") {
-        this.form.fileInfoList = [];
-      }
-      this.$nextTick(() => {
-        this.$refs.addInbound.loading = true;
-        this.$refs.addInbound.countryChange(this.form.countryId);
-        this.$refs.addInbound.provinceChange(this.form.provinceId);
-        this.$refs.addInbound.loading = false;
-      });
+    handleSee(row) {
+      API.checkDetails({ checkInfoId: row.id }).then(
+        (res) => {
+          this.checkDetailsList = res.data.data;
+          this.openDetails = true;
+        },
+        (err) => {
+          console.log("checkDetails :" + err);
+        }
+      );
     },
     handleSubmit() {
-      API.purchaseAdd(this.form).then(
+      API.sendCheck(this.form).then(
         () => {
-          this.msgSuccess(this.$t("addSuccess"));
-          this.$refs.addInbound.loading = false;
+          this.msgSuccess("发起成功");
+          this.$refs.sendCheck.loading = false;
           this.open = false;
           this.getList();
         },
         (err) => {
-          console.log("purchaseAdd: " + err);
-          this.$refs.addInbound.loading = false;
+          console.log("sendCheck: " + err);
+          this.$refs.sendCheck.loading = false;
         }
       );
-      // if (this.inboundType === 10) {
-
-      // } else {
-      //   API.manualAdd(this.form).then(
-      //     () => {
-      //       this.msgSuccess(this.$t("addSuccess"));
-      //       this.open = false;
-      //       this.$refs.addInbound.loading = false;
-      //       this.getList();
-      //     },
-      //     (err) => {
-      //       console.log("manualAdd: " + err);
-      //       this.$refs.addInbound.loading = false;
-      //     }
-      //   );
-      // }
     },
 
     handleDelete(row) {
@@ -206,17 +187,30 @@ export default {
         "
       ></query>
       <el-table :data="tableList" v-loading="loading">
-        <el-table-column label="盘点单号" align="center" prop="code" />
-        <el-table-column label="仓库类型" align="center" prop="name" />
-        <el-table-column label="仓库名称" align="center" />
-        <el-table-column label="盘点时间" align="center" prop="contacts" />
-        <el-table-column label="盘点人" align="center" prop="phone" />
-        <el-table-column label="盘点结论" align="center" prop="phone" />
-        <el-table-column label="盘点详情" width="100" align="center">
+        <el-table-column label="盘点单号" align="left" prop="code" />
+        <el-table-column
+          label="仓库类型"
+          align="left"
+          prop="warehouseType"
+          :formatter="
+            (row) => dictDataEcho(row.warehouseType, warehouseTypeList)
+          "
+        />
+        <el-table-column label="仓库名称" align="left" prop="warehouseName" />
+        <el-table-column label="盘点时间" align="left" prop="createTime" />
+        <el-table-column label="盘点人" align="left" prop="createUserName" />
+        <el-table-column label="盘点结论" align="left" prop="resultType">
+          <template slot-scope="scope">
+            <div :style="{ color: scope.row.resultType === 1 ? 'red' : '' }">
+              {{ scope.row.resultType === 0 ? "正常" : "异常" }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="盘点详情" width="120" align="center">
           <template slot-scope="scope">
-            <el-button type="text" @click="deleteRow(scope.$index)">{{
-              $t("delete")
-            }}</el-button>
+            <el-button type="text" @click="handleSee(scope.row)"
+              >查看</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -240,12 +234,37 @@ export default {
         :form="form"
         :warehouseSelectList="warehouseSelectList"
         :warehouseTypeList="warehouseTypeList"
-        :inboundType="inboundType"
+        :productTypeList="productTypeList"
         @submit="handleSubmit"
         @cancel="handleCancel"
         ref="sendCheck"
       ></send-check>
     </el-dialog>
+
+    <el-dialog
+      title="盘点明细"
+      :visible.sync="openDetails"
+      v-if="openDetails"
+      width="40%"
+    >
+      <el-table :data="checkDetailsList">
+        <el-table-column
+          label="产品类型"
+          align="left"
+          prop="type"
+          :formatter="(row) => dictDataEcho(row.type, productTypeList)"
+        />
+        <el-table-column label="产品编码" align="left" prop="code" />
+        <el-table-column label="产品名称" align="left" prop="name" />
+        <el-table-column label="产品单位" align="left" prop="unit" />
+        <el-table-column
+          label="库存数量"
+          align="left"
+          prop="inventoryQuantity"
+        />
+        <el-table-column label="盘点数量" align="left" prop="checkQuantity" />
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 

src/views/inventory-management/check/sendCheck.vue

@@ -9,17 +9,18 @@
         label-width="100px"
       >
         <el-form-item label-width="0px">
-          <el-button type="primary" @click="handleAddProduct">
+          <el-button type="primary" size="small" @click="handleAddProduct">
             添加物品</el-button
           >
         </el-form-item>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="盘点仓库" prop="id">
+            <el-form-item label="盘点仓库" prop="warehouseId">
               <el-select
-                v-model="form.id"
-                :placeholder="$t('pleaseSelect')"
+                v-model="form.warehouseId"
+                placeholder="请选择"
                 style="width: 100%"
+                @change="handleChange"
               >
                 <el-option
                   v-for="item in warehouseSelectList"
@@ -39,48 +40,39 @@
           </el-col>
         </el-row>
 
-        <el-form-item>
-          <el-table :data="form.changeDetailsList">
+        <el-form-item style="margin-top: 20px">
+          <el-table :data="form.checkDetailsList">
             <el-table-column label="物品编码" prop="productCode">
             </el-table-column>
             <el-table-column label="物品名称" prop="productName">
             </el-table-column>
-            <el-table-column label="物品类型" prop="productType">
-            </el-table-column>
-            <el-table-column label="单位" prop="warehouseName">
-            </el-table-column>
-            <el-table-column label="仓库现有库存" prop="applyPurchaseQuantity">
+            <el-table-column label="单位" prop="productUnit"> </el-table-column>
+            <el-table-column label="仓库现有库存" prop="inventoryQuantity">
             </el-table-column>
             <el-table-column label="盘盈亏" prop="shipmentQuantity">
             </el-table-column>
-            <el-table-column label="盘点数量" prop="changeQuantity">
+            <el-table-column label="盘点数量" prop="checkQuantity">
               <template slot-scope="scope">
                 <el-form-item
-                  :prop="
-                    'changeDetailsList.' + scope.$index + '.changeQuantity'
-                  "
-                  :rules="formRules.changeQuantity"
+                  :prop="'checkDetailsList.' + scope.$index + '.checkQuantity'"
+                  :rules="formRules.checkQuantity"
                   :inline-message="true"
                   label-width="0"
                 >
                   <el-input
-                    v-model="scope.row.changeQuantity"
-                    :placeholder="$t('pleaseInput')"
+                    v-model="scope.row.checkQuantity"
+                    placeholder="请输入"
                     size="mini"
                   >
                   </el-input>
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column
-              :label="$t('operation')"
-              width="100"
-              align="center"
-            >
+            <el-table-column label="操作" width="100" align="left">
               <template slot-scope="scope">
-                <el-button type="text" @click="deleteRow(scope.$index)">{{
-                  $t("delete")
-                }}</el-button>
+                <el-button type="text" @click="deleteRow(scope.$index)"
+                  >删除</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
@@ -88,35 +80,49 @@
       </el-form>
     </div>
     <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel"
-        >{{ $t("cancel") }}
-      </el-button>
+      <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
-        {{ $t("submit") }}</el-button
+        确定</el-button
       >
     </div>
 
     <el-dialog
-      :title="$t('goodsSelect')"
+      title="物品选择"
       v-if="selectDialog"
       :visible.sync="selectDialog"
       width="80%"
       top="60px"
     >
-      <selectProduct @select="handleSelect"></selectProduct>
+      <el-table :data="tableList">
+        <el-table-column
+          label="产品类型"
+          align="left"
+          prop="type"
+          :formatter="(row) => dictDataEcho(row.type, productTypeList)"
+        />
+        <el-table-column label="产品编码" align="left" prop="code" />
+        <el-table-column label="产品名称" align="left" prop="name" />
+        <el-table-column label="产品单位" align="left" prop="unit" />
+        <el-table-column label="库存" align="left" prop="inventoryQuantity" />
+        <el-table-column label="操作" align="left" width="80">
+          <template slot-scope="scope">
+            <el-button type="text" @click="handleSelect(scope.row)"
+              >选择
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import labelTitle from "@/components/label-title/index.vue";
-import selectProduct from "@/components/select-product/index.vue";
-
-import * as API from "@/api/inbound-outbound/inbound/index.js";
+import { getProductsByWarehouseId } from "@/api/inventory-management/check.js";
 
 export default {
   name: "addInbound",
-  components: { labelTitle, selectProduct },
+  components: { labelTitle },
   props: {
     form: {
       type: Object,
@@ -130,20 +136,25 @@ export default {
       type: Array,
       default: () => [],
     },
+    productTypeList: {
+      type: Array,
+      default: () => [],
+    },
   },
   data() {
     return {
       selectLit: [],
       loading: false,
+      tableList: [],
       formRules: {
-        id: [
+        warehouseId: [
           {
             required: true,
             message: "请选择盘点仓库",
             trigger: "change",
           },
         ],
-        changeQuantity: [
+        checkQuantity: [
           {
             required: true,
             message: "请输入盘点数量",
@@ -151,7 +162,6 @@ export default {
           },
         ],
       },
-
       selectDialog: false,
     };
   },
@@ -161,7 +171,6 @@ export default {
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.loading = true;
-
           this.$emit("submit");
         }
       });
@@ -169,36 +178,33 @@ export default {
     handleCancel() {
       this.$emit("cancel");
     },
-    handleChange() {},
-    handleChangeWarehouse(id) {
-      const current = this.warehouseSelectList.find((x) => x.id === id);
-      if (current) {
-        this.warehouseName = current.name;
-      }
-      this.form.changeDetailsList = [];
-    },
     handleAddProduct() {
-      if (!this.form.id) return this.msgInfo("请先选择盘点仓库");
+      if (!this.form.warehouseId) return this.msgInfo("请先选择盘点仓库");
       this.selectDialog = true;
     },
     handleSelect(row) {
-      const flag = this.form.changeDetailsList.some(
-        (x) => x.goodsId === row.id
-      );
+      const flag = this.form.checkDetailsList.some((x) => x.goodsId === row.id);
       if (flag) return this.msgInfo("该物品已经选择");
       const product = {
         productCode: row.code,
         productName: row.name,
         productType: row.type,
-        warehouseName: this.warehouseName,
-        goodsId: row.id,
-        changeQuantity: "",
+        productUnit: row.unit,
+        productId: row.id,
+        inventoryQuantity: row.inventoryQuantity,
+        checkQuantity: "",
       };
-      this.form.changeDetailsList.push(product);
+      this.form.checkDetailsList.push(product);
     },
     deleteRow(index) {
-      this.form.changeDetailsList.splice(index, 1);
-      this.msgSuccess(this.$t("deleteSuccess"));
+      this.form.checkDetailsList.splice(index, 1);
+      this.msgSuccess("删除成功");
+    },
+    handleChange(val) {
+      this.form.checkDetailsList = [];
+      getProductsByWarehouseId({ warehouseId: val }).then((res) => {
+        this.tableList = res.data.data.records;
+      });
     },
   },
 };

src/views/inventory-management/combination/index.vue

@@ -204,22 +204,18 @@ export default {
         "
       ></query>
       <el-table :data="tableList" v-loading="loading">
-        <el-table-column label="产品组合编码" align="center" prop="code" />
+        <el-table-column label="产品组合编码" align="left" prop="code" />
 
-        <el-table-column label="产品组合名称" align="center" prop="code" />
-        <el-table-column label="规格" align="center" prop="name" />
-        <el-table-column label="单位" align="center" :formatter="showAddress" />
-        <el-table-column
-          label="组合后放置仓库"
-          align="center"
-          prop="contacts"
-        />
-        <el-table-column label="半成品所在仓库" align="center" prop="phone" />
-        <el-table-column label="组合数量" align="center" prop="phone" />
-        <el-table-column label="操作人" align="center" prop="phone" />
-        <el-table-column label="操作时间" align="center" prop="phone" />
+        <el-table-column label="产品组合名称" align="left" prop="code" />
+        <el-table-column label="规格" align="left" prop="name" />
+        <el-table-column label="单位" align="left" :formatter="showAddress" />
+        <el-table-column label="组合后放置仓库" align="left" prop="contacts" />
+        <el-table-column label="半成品所在仓库" align="left" prop="phone" />
+        <el-table-column label="组合数量" align="left" prop="phone" />
+        <el-table-column label="操作人" align="left" prop="phone" />
+        <el-table-column label="操作时间" align="left" prop="phone" />
 
-        <el-table-column label="操作" align="center" width="120">
+        <el-table-column label="操作" align="left" width="120">
           <template slot-scope="scope">
             <el-button type="text" @click="handleEdit(scope.row)"
               >查看

src/views/inventory-management/query/index.vue

@@ -114,20 +114,16 @@ export default {
         <el-table :data="tableList" v-loading="loading">
           <!-- <el-table-column
             label="产品类型"
-            align="center"
+            align="left"
             :formatter="(row) => dictDataEcho(row.type, productTypeList)"
           /> -->
-          <el-table-column
-            label="仓库名称"
-            align="center"
-            prop="customerName"
-          />
-          <el-table-column label="产品编码" align="center" prop="amountMoney" />
-          <el-table-column label="产品名称" align="center" />
-          <el-table-column label="规格" align="center" prop="orderTime" />
-          <el-table-column label="单位" align="center" prop="orderTime" />
-          <el-table-column label="库存数量" align="center" />
-          <el-table-column label="查看" align="center">
+          <el-table-column label="仓库名称" align="left" prop="customerName" />
+          <el-table-column label="产品编码" align="left" prop="amountMoney" />
+          <el-table-column label="产品名称" align="left" />
+          <el-table-column label="规格" align="left" prop="orderTime" />
+          <el-table-column label="单位" align="left" prop="orderTime" />
+          <el-table-column label="库存数量" align="left" />
+          <el-table-column label="查看" align="left">
             <template>
               <el-button type="text" @click="deleteRow(scope.$index)"
                 >出库记录</el-button
@@ -156,12 +152,12 @@ export default {
           "
         ></query>
         <el-table :data="tableList" v-loading="loading">
-          <el-table-column label="产品编码" align="center" prop="amountMoney" />
-          <el-table-column label="产品名称" align="center" />
-          <el-table-column label="规格" align="center" prop="orderTime" />
-          <el-table-column label="单位" align="center" prop="orderTime" />
-          <el-table-column label="库存数量" align="center" />
-          <el-table-column label="查看" align="center">
+          <el-table-column label="产品编码" align="left" prop="amountMoney" />
+          <el-table-column label="产品名称" align="left" />
+          <el-table-column label="规格" align="left" prop="orderTime" />
+          <el-table-column label="单位" align="left" prop="orderTime" />
+          <el-table-column label="库存数量" align="left" />
+          <el-table-column label="查看" align="left">
             <template>
               <el-button type="text" @click="deleteRow(scope.$index)"
                 >出库记录</el-button
@@ -190,17 +186,13 @@ export default {
           "
         ></query>
         <el-table :data="tableList" v-loading="loading">
-          <el-table-column
-            label="组合编码"
-            align="center"
-            prop="customerName"
-          />
-          <el-table-column label="组合名称" align="center" />
-          <el-table-column label="规格" align="center" />
-          <el-table-column label="单位" align="center" />
-          <el-table-column label="库存数量" align="center" />
-          <el-table-column label="可组合数量" align="center" />
-          <el-table-column label="查看" align="center">
+          <el-table-column label="组合编码" align="left" prop="customerName" />
+          <el-table-column label="组合名称" align="left" />
+          <el-table-column label="规格" align="left" />
+          <el-table-column label="单位" align="left" />
+          <el-table-column label="库存数量" align="left" />
+          <el-table-column label="可组合数量" align="left" />
+          <el-table-column label="查看" align="left">
             <template>
               <el-button type="text" @click="deleteRow(scope.$index)"
                 >出库记录</el-button