src/api/repair/stockOperate/stockOperate.js

@@ -11,7 +11,6 @@ export function createRepairSo(data){
   })
 }
 
-// 分页
 export function getRepairSoPage(params){
   return request({
     url: preUrl + "/page",
@@ -19,12 +18,3 @@ export function getRepairSoPage(params){
     params
   })
 }
-
-// 作废
-export function voidSo(data){
-  return request({
-    url: preUrl + "/void",
-    method: "post",
-    data
-  })
-}

src/api/repair/stockOperate/stockOperateItem.js

@@ -1,12 +1 @@
 import request from '@/utils/request'
-
-const preUrl= "/repair/soi"
-
-// 分页查询
-export function getSoiPage(params){
-  return request({
-    url: preUrl + "/page",
-    method: "get",
-    params
-  })
-}

src/views/repair/Components/CorpChoose.vue

@@ -10,12 +10,6 @@ import {getCompanyList} from "@/api/base/company";
 
 export default {
   name: "",
-  props:{
-    value:{
-      type: Object,
-      default: null
-    }
-  },
   data() {
     return {
       corpSelected: undefined,
@@ -25,14 +19,7 @@ export default {
   watch:{
     corpSelected(val) {
       const company = this.corpList.find(item => item.id === val);
-      this.$emit("input", company);
+      this.$emit("selected", company);
-    },
-    value(val){
-      if (val){
-        this.corpSelected = val.id
-      }else {
-        this.corpSelected = null
-      }
     }
   },
   mounted() {

src/views/repair/Components/PartChoose.vue

@@ -36,7 +36,7 @@ export default {
           price: "100",
           type: "不知道",
           unit: "个",
-          warehouse: "6335b519fde3cabf298e763bc1c38df1",
+          warehouse: "d1",
           miniStock: 100,
           maxStock: 100,
           stock: 20,
@@ -57,7 +57,7 @@ export default {
           price: "10",
           type: "不知道",
           unit: "个",
-          warehouse: "6335b519fde3cabf298e763bc1c38df1",
+          warehouse: "d2",
           miniStock: 10,
           maxStock: 10,
           stock: 5,

src/views/repair/Components/WarehouseChoose.vue

@@ -22,13 +22,6 @@ import {getBaseWarehouseList} from "@/api/base/warehouse";
 
 export default {
   name: "WarehouseChoose",
-  props:{
-    value:{
-      type: String,
-      default: "",
-      required:false
-    }
-  },
   data() {
     return {
       warehouseSelected: undefined,
@@ -40,15 +33,6 @@ export default {
       }
     }
   },
-  watch:{
-    value(val){
-      if (val){
-        this.warehouseSelected = val
-      }else {
-        this.warehouseSelected = null
-      }
-    },
-  },
   created() {
     this.listWarehouse()
   },

src/views/repair/stockOperate/Components/SoIndex.vue

@@ -4,7 +4,6 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item :label="soByType ? '采购时间' : '领料时间'" prop="searchTimeArray">
         <el-date-picker
-          value-format="yyyy-MM-dd HH:mm:ss"
           v-model="queryParams.searchTimeArray"
           type="daterange"
           range-separator="至"
@@ -13,7 +12,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="soByType && !goodsYes" label="供应商" prop="supplierId">
-        <SupplierChoose v-model="queryParams.supplierId"/>
+        <SupplierChoose/>
       </el-form-item>
       <el-form-item v-if="goodsYes" label="关键字" prop="soNo">
         <el-input v-model="queryParams.soNo" style="width: 18rem" placeholder="请输入单号、商品名称或编码"/>
@@ -30,10 +29,10 @@
         </el-select>
       </el-form-item>
       <el-form-item v-if="!soByType" label="领料人" prop="userId">
-        <StaffChoose v-model="queryParams.userId" @selected="getStaff"/>
+        <StaffChoose @selected="getStaff"/>
       </el-form-item>
       <el-form-item :label="soByType ? '采购门店' : '领料门店'" prop="corpId">
-        <CorpChoose v-model="queryParams.corpId"  @selected="getCompany"/>
+        <CorpChoose @selected="getCompany"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -56,7 +55,7 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单号" align="center" prop="soId" width="200"/>
+      <el-table-column label="单号" align="center" prop="soNo" width="180"/>
       <el-table-column label="商品名称" align="center" width="180" prop="name"/>
       <el-table-column label="规格" align="center" width="180" prop="name"/>
       <el-table-column label="商品编码" align="center" width="180" prop="name"/>
@@ -85,38 +84,29 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单号" align="center" prop="soNo" width="200"/>
+      <el-table-column label="单号" align="center" prop="soNo" width="180"/>
       <el-table-column label="数量" align="center" prop="itemCount" width="150"/>
       <el-table-column label="金额" align="center" prop="totalPrice" width="150"/>
       <el-table-column :label="soByType ? '采购员' : '领料人'" align="center" prop="userName" width="150"/>
-      <el-table-column v-if="soByType" label="供应商" align="center" prop="supplierName" width="200"/>
+      <el-table-column v-if="soByType" label="供应商" align="center" prop="supplierName" width="150"/>
       <el-table-column :label="soByType ? '入库时间' : '领料时间'" align="center" prop="soTime" width="150"/>
-      <el-table-column label="登记时间" align="center" prop="createTime" width="150">
+      <el-table-column label="登记时间" align="center" prop="createTime" width="150"/>
-        <template slot-scope="scope">
-          {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
-        </template>
-      </el-table-column>
       <el-table-column label="门店" align="center" prop="corpName" width="180"/>
-      <el-table-column v-if="soByType" label="状态" align="center" prop="soStatus" width="150">
+      <el-table-column v-if="soByType" label="状态" align="center" prop="soStatus" width="150"/>
-        <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.REPAIR_SO_STATUS" :value="scope.row.soStatus"/>
-        </template>
-      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" width="180"/>
       <el-table-column label="操作" fixed="right" width="180" align="center">
         <template v-slot="scope">
-<!--          <el-button size="mini" type="text" icon="el-icon-edit"-->
+          <el-button size="mini" type="text" icon="el-icon-edit"
-<!--          >修改-->
+          >修改
-<!--          </el-button>-->
+          </el-button>
-          <el-button size="mini" type="text" icon="el-icon-close" @click="handleVoidSo(scope.row)"
+          <el-button size="mini" type="text" icon="el-icon-close"
           >作废
           </el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <pagination style="margin-bottom: 3rem" v-show="total > 0" :total="total" :page.sync="queryParams.pageNo"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                :limit.sync="queryParams.pageSize"
     />
   </div>
 </template>
@@ -127,8 +117,7 @@ import SupplierChoose from "@/views/repair/Components/SupplierChoose.vue";
 import CorpChoose from "@/views/repair/Components/CorpChoose.vue";
 import StaffChoose from "@/views/repair/Components/StaffChoose.vue";
 import {DICT_TYPE} from "@/utils/dict";
-import {getRepairSoPage, voidSo} from "@/api/repair/stockOperate/stockOperate";
+import {getRepairSoPage} from "@/api/repair/stockOperate/stockOperate";
-import {getSoiPage} from "@/api/repair/stockOperate/stockOperateItem";
 
 export default {
   name: "SoIndex",
@@ -168,14 +157,7 @@ export default {
         corpId: null,
         userId: null,
         userName: null,
-        soType: this.soByType ? "01" : "02",
+        soType: this.soByType ? "01" : "02"
-        purchaseType: this.goodsYes ? "02" : "01",
-        goodsType: this.goodsYes ? "1" : "0"
-      },
-      formData: {
-        remark: null,
-        id: null,
-        soStatus: "06"
       },
       showSearch: true,
       list: [],
@@ -189,16 +171,6 @@ export default {
   methods: {
     // 分页
     async pageSo() {
-      if (this.soByType && this.goodsYes) {
-        try {
-          this.loading = true
-          const res = await getSoiPage(this.queryParams)
-          this.list = res.data.records
-          this.total = res.data.total
-        } finally {
-          this.loading = false
-        }
-      } else {
       try {
         this.loading = true
         const res = await getRepairSoPage(this.queryParams)
@@ -207,12 +179,9 @@ export default {
       }finally {
         this.loading = false
       }
-      }
     },
     // 搜索按钮
     handleQuery() {
-      this.queryParams.pageNo = 1
-      this.pageSo()
     },
     // 搜索重置
     resetQuery() {
@@ -227,25 +196,6 @@ export default {
     // 门店选择
     getCompany(data) {
       console.log(data)
-    },
-    // 作废
-    handleVoidSo(row) {
-      this.$prompt('作废备注', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-      }).then(({value}) => {
-        this.formData.id = row.id
-        this.formData.remark = value
-        this.doVoidSo()
-      }).catch(() => {
-      })
-    },
-    async doVoidSo() {
-      try {
-        await voidSo(this.formData)
-        this.$modal.msgSuccess("作废成功")
-        await this.pageSo()
-      }catch{}
     }
   }
 }

src/views/repair/stockOperate/Components/SoVoid.vue

@@ -4,7 +4,6 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="作废时间" prop="searchTimeArray">
         <el-date-picker
-          value-format="yyyy-MM-dd HH:mm:ss"
           v-model="queryParams.searchTimeArray"
           type="daterange"
           range-separator="至"
@@ -13,20 +12,20 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="soByType" label="供应商" prop="supplierId">
-        <SupplierChoose v-model="queryParams.supplierId" />
+        <SupplierChoose />
       </el-form-item>
       <el-form-item label="单据号" prop="soNo">
         <el-input v-model="queryParams.soNo" style="width: 18rem" placeholder="请输入单号、备注"/>
       </el-form-item>
       <el-form-item v-if="!soByType" label="领料人" prop="userId">
-        <StaffChoose v-model="queryParams.userId" @selected="getStaff"/>
+        <StaffChoose @selected="getStaff"/>
       </el-form-item>
       <el-form-item :label="soByType ? '采购门店' : '领料门店'" prop="corpId">
-        <CorpChoose v-model="queryParams.corpId" />
+        <CorpChoose />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="handleResetQuery">重置</el-button>
+        <el-button icon="el-icon-refresh">重置</el-button>
       </el-form-item>
     </el-form>
     <!-- 操作 -->
@@ -39,28 +38,20 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单号" align="center" prop="soNo" width="200" />
+      <el-table-column label="单号" align="center" prop="soNo" width="180" />
-      <el-table-column label="数量" align="center" width="150" prop="itemCount" />
+      <el-table-column label="数量" align="center" width="150" prop="name" />
       <el-table-column label="金额" align="center" prop="totalPrice" width="150" />
       <el-table-column :label="soByType ? '采购员' : '领料人'" align="center" prop="userName" width="150" />
       <el-table-column v-if="soByType" label="供应商" align="center" prop="supplierName" width="150" />
       <el-table-column :label="soByType ? '入库时间' : '领料时间'" align="center" prop="soTime" width="150" />
-      <el-table-column label="登记时间" align="center" prop="createTime" width="150">
+      <el-table-column label="登记时间" align="center" prop="createTime" width="150" />
-        <template slot-scope="scope">
+      <el-table-column label="作废时间" align="center" prop="createTime" width="150" />
-          {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
+      <el-table-column label="作废人" align="center" prop="createTime" width="150" />
-        </template>
-      </el-table-column>
-      <el-table-column label="作废时间" align="center" prop="updateTime" width="150">
-        <template slot-scope="scope">
-          {{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}
-        </template>
-      </el-table-column>
-      <el-table-column label="作废人" align="center" prop="updater" width="150" />
       <el-table-column label="门店" align="center" prop="corpName" width="180" />
       <el-table-column label="作废备注" align="center" prop="remark" width="180" />
     </el-table>
     <!-- 分页 -->
-    <pagination style="margin-bottom: 3rem" v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
     />
   </div>
 </template>
@@ -69,7 +60,6 @@
 import CorpChoose from "@/views/repair/Components/CorpChoose.vue";
 import SupplierChoose from "@/views/repair/Components/SupplierChoose.vue";
 import StaffChoose from "@/views/repair/Components/StaffChoose.vue";
-import {getRepairSoPage} from "@/api/repair/stockOperate/stockOperate";
 
 export default {
   name: "SoVoid",
@@ -92,10 +82,7 @@ export default {
         supplierName: null,
         corpId: null,
         userId: null,
-        userName: null,
+        userName: null
-        soType: this.soByType ? "01" : "02",
-        purchaseType: this.goodsYes ? "02" : "01",
-        soStatus: "06"
       },
       showSearch: true,
       loading: false,
@@ -103,35 +90,12 @@ export default {
       total: 0,
     }
   },
-  mounted() {
-    this.pageSo()
-  },
   methods: {
-    async pageSo(){
-      try {
-        this.loading = true
-        const res = await getRepairSoPage(this.queryParams)
-        this.list = res.data.records
-        this.total = res.data.total
-      }finally {
-        this.loading = false
-      }
-    },
     // 子组件回调
     getStaff(data){
       this.queryParams.userId = data.id
       this.queryParams.userName = data.name
     },
-    // 搜索
-    handleQuery(){
-      this.queryParams.pageNo = 1
-      this.pageSo()
-    },
-    // 重置
-    handleResetQuery(){
-      this.resetForm('queryForm')
-      this.handleQuery()
-    }
   }
 }
 </script>

src/views/repair/stockOperate/Components/SoiTable.vue

@@ -4,7 +4,6 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item :label="soByType ? '采购时间' : '领料时间'" prop="searchTimeArray">
         <el-date-picker
-          value-format="yyyy-MM-dd HH:mm:ss"
           v-model="queryParams.searchTimeArray"
           type="daterange"
           range-separator="至"
@@ -15,18 +14,18 @@
       <el-form-item label="关键字" prop="soNo">
         <el-input v-model="queryParams.soNo" style="width: 18rem" placeholder="请输入单号、商品名称或编码"/>
       </el-form-item>
-      <el-form-item v-if="soByType" label="规格" prop="standard">
+      <el-form-item v-if="soByType" label="规格" prop="soNo">
-        <el-input v-model="queryParams.standard" style="width: 18rem" placeholder="请输入规格"/>
+        <el-input v-model="queryParams.soNo" style="width: 18rem" placeholder="请输入单号、商品名称或编码"/>
       </el-form-item>
       <el-form-item :label="soByType ? '采购门店' : '领料门店'" prop="corpId">
-        <CorpChoose v-model="queryParams.corpId" />
+        <CorpChoose />
       </el-form-item>
-      <el-form-item v-if="soByType" label="所属库位" prop="warehouseId">
+      <el-form-item v-if="soByType" label="所属库位" prop="corpId">
-        <WarehouseChoose v-model="queryParams.warehouseId" @selected="getWarehouse"/>
+        <WarehouseChoose @selected="getWarehouse"/>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="handleResetQuery">重置</el-button>
+        <el-button icon="el-icon-refresh">重置</el-button>
       </el-form-item>
     </el-form>
     <!-- 操作 -->
@@ -45,7 +44,7 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单号" align="center" prop="soId" width="200" />
+      <el-table-column label="单号" align="center" prop="soNo" width="180" />
       <el-table-column label="商品名称" align="center" prop="soNo" width="180" />
       <el-table-column :label="soByType ? '采购员' : '领料人'" align="center" prop="soNo" width="180" />
       <el-table-column label="商品编码" align="center" prop="soNo" width="180" />
@@ -69,7 +68,6 @@
 <script>
 import CorpChoose from "@/views/repair/Components/CorpChoose.vue";
 import WarehouseChoose from "@/views/repair/Components/WarehouseChoose.vue";
-import {getSoiPage} from "@/api/repair/stockOperate/stockOperateItem";
 
 export default {
   name: "SoiTable",
@@ -89,8 +87,6 @@ export default {
         searchTimeArray:[],
         soNo: null,
         corpId: null,
-        soiType: this.soByType ? "01" : "02",
-        warehouseId: null
       },
       showSearch: true,
       loading: false,
@@ -98,34 +94,10 @@ export default {
       total: 0,
     }
   },
-  mounted() {
-    this.pageSoi()
-  },
   methods: {
     // 库位选择
     getWarehouse(data){
     },
-    // 分页
-    async pageSoi(){
-      try {
-        this.loading = true
-        const res = await getSoiPage(this.queryParams)
-        this.list = res.data.records
-        this.total = res.data.total
-      }finally {
-        this.loading = false
-      }
-    },
-    // 搜索
-    handleQuery(){
-      this.queryParams.pageNo = 1
-      this.pageSoi()
-    },
-    // 重置
-    handleResetQuery(){
-      this.resetForm('queryForm')
-      this.handleQuery()
-    }
   }
 }
 </script>