Merge remote-tracking branch 'origin/dev' into dev

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

@@ -121,7 +121,7 @@ export default {
         userId: null,
         userName: null,
         soType: this.soByType ? "01" : "02",
-        purchaseType: this.goodsYes ? "02" : "01",
+        purchaseType: null,
         soStatus: "06"
       },
       showSearch: true,
@@ -139,6 +139,9 @@ export default {
         if (this.isBack){
           this.queryParams.soType = "04"
         }
+        if (this.soByType){
+          this.queryParams.purchaseType = this.goodsYes ? "02" : "01"
+        }
         this.loading = true
         const res = await getRepairSoPage(this.queryParams)
         this.list = res.data.records

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

@@ -20,7 +20,8 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单据号" align="center" prop="no" />
+      <el-table-column label="单据号" align="center" prop="no" width="200"/>
+      <el-table-column label="客户车牌" align="center" prop="licenseNumber" />
       <el-table-column label="服务顾问" align="center" prop="adviserName" />
       <el-table-column label="申请人" align="center" prop="repairName" />
       <el-table-column label="状态" align="center" prop="status">
@@ -312,6 +313,9 @@ export default {
               item.isStock = this.type ? count <= item.wares.stock : true
             })
         this.items = this.items.filter(item => this.type ? item.waresStatus === '02' : item.waresAlreadyCount)
+        if (!this.type){
+          this.items = this.items.filter(item => item.waresAlreadyCount !== item.waresBackCount)
+        }
       }finally {
         this.dialogLoading = false
       }
@@ -464,7 +468,7 @@ export default {
 
 <style scoped lang="scss">
 ::v-deep .el-table .stock td{
-  background-color: #ff0000 !important; /* 红色背景 */
+  color: #ff0000 !important; /* 红色背景 */
 }
 .item {
   .item__input {

src/views/repair/tickets/Components/TicketWares.vue

@@ -27,6 +27,7 @@
         </template>
       </el-table-column>
       <el-table-column label="单据号" align="center" prop="no"/>
+      <el-table-column label="客户车牌" align="center" prop="licenseNumber" />
       <el-table-column label="服务顾问" align="center" prop="adviserName"/>
       <el-table-column label="申请人" align="center" prop="repairName"/>
       <el-table-column label="状态" align="center" prop="status">

src/views/repair/tickets/form/TWOperate.vue

@@ -295,7 +295,8 @@ export default {
         items: [],
         remark: null,
         adviserId: null,
-        adviserName: null
+        adviserName: null,
+        licenseNumber: null,
       },
       addWaresVisible: false,
       waresFormData:{
@@ -360,7 +361,8 @@ export default {
         items: [],
         remark: this.formData.remark,
         adviserId: null,
-        adviserName: null
+        adviserName: null,
+        licenseNumber: null,
       }
       this.formData.no = createUniqueCodeByHead(this.info.type ? 'LLSQ' : 'TLSQ')
       this.formData.ticketId = this.info.id
@@ -368,6 +370,7 @@ export default {
       this.formData.status = '01'
       this.formData.adviserId = this.info.adviserId
       this.formData.adviserName = this.info.adviserName
+      this.formData.licenseNumber = this.info.carNo
       this.formData.items = [
         ...this.chooseList.map(item => {
           return {

src/views/repair/tickets/form/UpdateRepair.vue

@@ -151,7 +151,7 @@
         </div>
       </el-card>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+        <el-button type="primary" @click="submitForm" :disabled="!this.selectedRows">确 定</el-button>
         <el-button @click="dialogVisible = false">取 消</el-button>
       </div>
     </el-dialog>