完善维修领料

yxt-as-ui/src/views/maintenanceReceive/index.vue

@@ -75,8 +75,8 @@
             <el-table-column prop="isGoOut" label="是否外出" align="center"/>
             <el-table-column prop="customerName" label="客户名称" align="center"/>
             <el-table-column prop="mobile" label="联系电话" align="center"/>
-            <el-table-column prop="vehMark" label="车架号" align="center"/>
+            <el-table-column prop="vinNo" label="车架号" align="center"/>
-            <el-table-column prop="vinNo" label="车牌号" align="center"/>
+            <el-table-column prop="vehMark" label="车牌号" align="center"/>
             <el-table-column prop="entryTime" width="180" label="进厂日期" align="center"/>
           </el-table>
         </div>
@@ -280,22 +280,25 @@ export default {
       }
     },
     toOut() {
-      // this.viewState = 2
       if (this.sids.length === 1) {
+        if (this.selectionList[0].repairState === '维修中') {
           this.viewState = 2
           this.$refs['divOutInfo'].showAdd(this.sids[0])
         } else {
-        this.$message({
+          this.$message({ showClose: true, type: 'error', message: '请选择维修状态为维修中的记录进行操作' })
-          showClose: true,
+        }
-          type: 'warning',
+      } else {
-          message: '请选择一条记录进行操作'
+        this.$message({ showClose: true, type: 'warning', message: '请选择一条记录进行操作' })
-        })
       }
     },
     toReturn() {
       if (this.sids.length === 1) {
+        if (this.selectionList[0].nodeName === '维修') {
           this.viewState = 3
           this.$refs['divReturnInfo'].showAdd(this.sids[0])
+        } else {
+          this.$message({ showClose: true, type: 'error', message: '请选择维修单处于维修阶段的进行操作' })
+        }
       } else {
         this.$message({
           showClose: true,
@@ -315,8 +318,7 @@ export default {
         req.printSettlement(info).then((res) => {
           if (res.success) {
             var xhr = new XMLHttpRequest()
-            xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data +
+            xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data + '&outFileName=' + '领料单', true)
-              '&outFileName=' + '领料单', true)
             xhr.setRequestHeader('token', getStorage())
             xhr.responseType = 'blob'
             xhr.onload = function(e) {
@@ -347,22 +349,14 @@ export default {
     },
     toConfirm() {
       if (this.sids.length === 1) {
-        if (this.selectionList[0].repairState == '维修完成') {
+        if (this.selectionList[0].repairState === '维修完成' && this.selectionList[0].nodeName === '维修') {
           this.viewState = 4
           this.$refs['divConfirmInfo'].showAdd(this.sids[0])
         } else {
-          this.$message({
+          this.$message({ showClose: true, type: 'warning', message: '请选择维修单处于维修阶段且维修状态为维修完成的进行操作' })
-            showClose: true,
-            type: 'warning',
-            message: '只能选择维修完成的工单'
-          })
         }
       } else {
-        this.$message({
+        this.$message({ showClose: true, type: 'warning', message: '请选择一条记录进行操作' })
-          showClose: true,
-          type: 'warning',
-          message: '请选择一条记录进行操作'
-        })
       }
     },
     doClose() {

yxt-as-ui/src/views/maintenanceReceive/maintenanceConfirm.vue

@@ -1,124 +1,67 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-
       <div class="tab-header webtop">
-        <!-- 标题 -->
         <div>商品出库确认</div>
-        <!-- start 添加修改按钮 -->
         <div>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">确认</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
-        <!-- end 添加修改按钮 -->
-        <!-- end 详情按钮 -->
       </div>
-
       <div class="listconadd">
-
         <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
-          <!-- <div class="title">
-          <div>基础信息</div>
-        </div> -->
           <el-row class="first_row">
-
             <el-col :span="24">
               <div class="span-sty">备注</div>
               <el-form-item>
                 <el-input v-model="confirmInfo.remarks" placeholder="备注" class="addinputw addinputInfo" clearable/>
               </el-form-item>
             </el-col>
-
           </el-row>
-
+          <div class="title">维修单</div>
-          <div class="title titleOne">
-            <div>维修工单</div>
-          </div>
-
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">维修工单编号</div>
+              <div class="span-sty">维修单编号</div>
-              <el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
-                <span class="addinputw addinputInfo">{{formobj.sourceBillNo}}</span>
-              </el-form-item>
             </el-col>
-
             <el-col :span="8">
               <div class="span-sty">单据日期</div>
-              <el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.billDate }}</span></el-form-item>
-                <span class="addinputw addinputInfo">{{formobj.billDate}}</span>
-              </el-form-item>
             </el-col>
-
             <el-col :span="8">
               <div class="span-sty">服务顾问</div>
-              <el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.waitorName }}</span></el-form-item>
-                <el-form-item><span class="addinputw addinputInfo">{{ formobj.waitorName }}</span></el-form-item>
-              </el-form-item>
             </el-col>
           </el-row>
-
           <el-row>
-
             <el-col :span="8">
-              <div class="span-sty">工单类型</div>
+              <div class="span-sty">维修单类型</div>
-              <el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.billType }}</span></el-form-item>
-                <span class="addinputw addinputInfo">{{formobj.billType}}</span>
-              </el-form-item>
             </el-col>
-
             <el-col :span="8">
               <div class="span-sty">科目</div>
-              <el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.subject }}</span></el-form-item>
-                <span class="addinputw addinputInfo">{{formobj.subject}}</span>
-              </el-form-item>
             </el-col>
-
             <el-col :span="8">
               <div class="span-sty">是否外出</div>
-              <el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.isGoOut == '1' ? '是' : '否' }}</span></el-form-item>
-                <el-radio-group class="addinputw addinputInfo" :disabled="true" v-model="formobj.isGoOut">
-                  <el-radio :label="'1'">是</el-radio>
-                  <el-radio :label="'2'">否</el-radio>
-                </el-radio-group>
-
-              </el-form-item>
             </el-col>
           </el-row>
-
           <el-row>
-
             <el-col :span="8">
               <div class="span-sty">客户名称</div>
-              <el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
-                <span class="addinputw addinputInfo">{{formobj.customerName}}</span>
-              </el-form-item>
             </el-col>
-
             <el-col :span="8">
               <div class="span-sty">车牌号/车架号</div>
-              <el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</span></el-form-item>
-                <span class="addinputw addinputInfo">{{formobj.vehMark}}/{{formobj.vinNo}}</span>
-              </el-form-item>
             </el-col>
-
-            <!-- <el-col :span="8">
-              <div class="span-sty">客户单位</div>
-              <el-form-item>
-                <el-form-item><span class="addinputw addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
-              </el-form-item>
-            </el-col> -->
           </el-row>
-
+          <div class="title">维修项目</div>
-          <div class="title titleOne">
-            <div>服务项目</div>
-          </div>
           <el-table v-loading="listLoading" :data="formobj.sitemVoList" border>
-            <!-- <el-table-column type="selection" align="center" width="50"/> -->
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
-            <el-table-column label="服务项目" prop="serviceItem" align="center" />
+            <el-table-column label="维修项目" prop="serviceItem" align="center"/>
             <el-table-column label="工种" prop="serviceType" align="center"/>
-            <!-- <el-table-column label="科目" prop="subject" align="center" /> -->
             <el-table-column label="维修技师" prop="repairerName" align="center"/>
             <el-table-column label="工时提成" prop="examineHourPrice" align="center"/>
             <el-table-column label="工时单价" prop="hourPrice" align="center"/>
@@ -129,48 +72,25 @@
             <el-table-column label="销售金额" prop="amount" align="center"/>
             <el-table-column label="备注" prop="remarks" align="center"/>
           </el-table>
-
+          <div class="title">维修用料</div>
-          <div class="title titleOne">
-            <div>商品列表</div>
-          </div>
           <el-row>
             <el-col :span="24">
               <div class="span-sty span-sty-one" style="width: 300px;!important;">前台登记时对商品要求备注</div>
-              <el-form-item><el-input class="addinputInfo-one" style="width: 70%" v-model="formobj.registerRemarks"
+              <el-form-item>
-                  clearable placeholder="" :disabled="true" /></el-form-item>
+                <el-input class="addinputInfo-one" style="width: 70%" v-model="formobj.registerRemarks" clearable placeholder="" :disabled="true"/>
+              </el-form-item>
             </el-col>
           </el-row>
           <el-table v-loading="listLoading" :data="formobj.detailList" border>
-            <!-- <el-table-column type="selection" align="center" width="50"/> -->
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
             <el-table-column label="项目名称" prop="serviceItem" align="center"/>
             <el-table-column label="商品ID" prop="goodsID" width="120" align="center"/>
             <el-table-column label="商品名称" prop="goodsSpuName" align="center"/>
-            <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
+            <el-table-column label="商品图号" prop="goodsSkuCode" align="center"/>
             <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center"/>
             <el-table-column label="单位" prop="unit" align="center"/>
             <el-table-column label="仓库" prop="warehouseName" align="center"/>
             <el-table-column label="库位" prop="warehouseRackCode" align="center"/>
-
-            <!-- <el-table-column label="仓库" align="center" width="180">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
-                  @change="selectWarehouseName(scope.row,$event)">
-                  <el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
-                  </el-option>
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="库位" align="center" width="180">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.warehouseRackCode" :disabled="scope.row.warehouseName==''" clearable
-                  @focus="getWarehouseAreaList(scope.row.warehouseSid)" placeholder="请选择"
-                  @change="selectWarehouseAreaCode(scope.row,$event)">
-                  <el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
-                  </el-option>
-                </el-select>
-              </template>
-            </el-table-column> -->
             <el-table-column label="单价" prop="price" align="center"/>
             <el-table-column label="库存数量" prop="inventoryNum" align="center"/>
             <el-table-column label="出库数量" prop="outboundCount" align="center"/>
@@ -178,29 +98,16 @@
             <el-table-column label="备注" prop="remarks" align="center"/>
             <el-table-column label="领料人" prop="receivePer" width="120" align="center"/>
             <el-table-column label="领料时间" prop="receiveTimes" width="120" align="center"/>
-            <!-- <el-table-column label="出库数量" align="center" width="120">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.count" clearable placeholder=""
-                  oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
-              </template>
-            </el-table-column>
-            <el-table-column label="备注" align="center" width="220">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.remarks" clearable placeholder="" />
-              </template>
-            </el-table-column> -->
           </el-table>
-
         </el-form>
-
       </div>
     </div>
-
   </div>
 </template>
 
 <script>
 import req from '@/api/maintenanceReceive/maintenanceReceive.js'
+
 export default {
   components: {},
   data() {
@@ -210,44 +117,30 @@
       submitdisabled: false,
       formobj: {},
       confirmInfo: {
-          sid: "",
+        sid: '',
-          remarks: ""
+        remarks: ''
       }
     }
   },
-    created() {},
   methods: {
     showAdd(sid) {
-
       this.confirmInfo.sid = sid
-
       var params = {
         sid: sid
       }
-        req.initBill(params)
+      req.initBill(params).then(resp => {
-          .then(resp => {
         if (resp.success) {
-              console.log('>>>>>>>>>initBill', resp)
-
           this.formobj = resp.data
-
-
         } else {
           // 根据resp.code进行异常情况处理
         }
       })
-          .catch(() => {})
-
     },
-
     resetState() {
       this.viewState = 1
     },
     saveOrUpdate() {
-        console.log('>>>>>>>>>saveOrUpdate', this.confirmInfo)
+      req.saveConfirm(this.confirmInfo).then(resp => {
-
-        req.saveConfirm(this.confirmInfo)
-          .then(resp => {
         if (resp.success) {
           this.$message({
             showClose: true,
@@ -259,10 +152,7 @@
           // 根据resp.code进行异常情况处理
         }
       })
-          .catch(() => {})
-
     },
-
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
       this.formobj = {}
@@ -271,10 +161,8 @@
     },
     indexMethod(index) {
       return index + 1
-      },
-
     }
-
+  }
 }
 </script>
 <style scoped>

yxt-as-ui/src/views/maintenanceReceive/maintenanceOutbound.vue

@@ -12,22 +12,16 @@
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row class="first_row">
             <el-col :span="8">
-              <div class="span-sty"><span class="must">*</span> 操作人</div>
+              <div class="span-sty">操作人</div>
-              <el-form-item prop="createByName">
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
-                <span class="addinputw addinputInfo">{{ formobj.createByName }}</span>
-              </el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty"><span class="must">*</span> 操作部门</div>
+              <div class="span-sty">操作部门</div>
-              <el-form-item prop="deptName">
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
-                <span class="addinputw addinputInfo">{{ formobj.deptName }}</span>
-              </el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">操作日期</div>
-              <el-form-item prop="createByName">
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
-                <el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
-              </el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -47,65 +41,46 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <div class="title">维修工单</div>
+          <div class="title">维修单</div>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">维修工单编号</div>
+              <div class="span-sty">维修单编号</div>
-              <el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
-                <span class="addinputw addinputInfo">{{ formobj.sourceBillNo }}</span>
-              </el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">单据日期</div>
-              <el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.billDate }}</span></el-form-item>
-                <span class="addinputw addinputInfo">{{ formobj.billDate }}</span>
-              </el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">服务顾问</div>
-              <el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.waitorName }}</span></el-form-item>
-                <el-form-item><span class="addinputw addinputInfo">{{ formobj.waitorName }}</span></el-form-item>
-              </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">工单类型</div>
+              <div class="span-sty">维修单类型</div>
-              <el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.billType }}</span></el-form-item>
-                <span class="addinputw addinputInfo">{{ formobj.billType }}</span>
-              </el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">科目</div>
-              <el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.subject }}</span></el-form-item>
-                <span class="addinputw addinputInfo">{{ formobj.subject }}</span>
-              </el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">是否外出</div>
-              <el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.isGoOut == '1' ? '是' : '否' }}</span></el-form-item>
-                <el-radio-group v-model="formobj.isGoOut" class="addinputw addinputInfo" :disabled="true">
-                  <el-radio :label="'1'">是</el-radio>
-                  <el-radio :label="'2'">否</el-radio>
-                </el-radio-group>
-              </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
               <div class="span-sty">客户名称</div>
-              <el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
-                <span class="addinputw addinputInfo">{{ formobj.customerName }}</span>
-              </el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">车牌号/车架号</div>
-              <el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</span></el-form-item>
-                <span class="addinputw addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</span>
-              </el-form-item>
             </el-col>
           </el-row>
-          <div class="title">服务项目</div>
+          <div class="title">维修项目</div>
           <el-table v-loading="listLoading" :data="formobj.sitemVoList" border>
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
             <el-table-column label="操作" wid align="center" width="120">
@@ -113,7 +88,7 @@
                 <el-button type="primary" size="mini" @click="addGoods(scope.row)">商品出库</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="服务项目" prop="serviceItem" align="center"/>
+            <el-table-column label="维修项目" prop="serviceItem" align="center"/>
             <el-table-column label="工种" prop="serviceType" align="center"/>
             <el-table-column label="维修技师" prop="repairerName" align="center"/>
             <el-table-column label="工时提成" prop="examineHourPrice" align="center"/>
@@ -129,7 +104,6 @@
           <el-table v-loading="listLoading" :data="formobj.receiveList" border>
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
             <el-table-column label="维修项目" prop="serviceItem" width="120" align="center"/>
-            <el-table-column label="商品ID" prop="goodsID" width="120" align="center"/>
             <el-table-column label="商品名称" prop="goodsSpuName" width="120" align="center"/>
             <el-table-column label="商品图号" prop="goodsSkuCode" width="100" align="center"/>
             <el-table-column label="规格" prop="goodsSkuOwnSpec" width="120" align="center"/>
@@ -144,6 +118,7 @@
             <el-table-column label="备注" prop="remarks" width="220" align="center"/>
             <el-table-column label="领料人" prop="receivePer" width="120" align="center"/>
             <el-table-column label="领料时间" prop="receiveTimes" width="120" align="center"/>
+            <el-table-column label="商品ID" prop="goodsID" width="120" align="center"/>
           </el-table>
           <div class="title">维修用料</div>
           <el-row>
@@ -162,7 +137,6 @@
               </template>
             </el-table-column>
             <el-table-column label="维修项目" prop="serviceItem" width="120" align="center"/>
-            <el-table-column label="商品ID" prop="goodsID" width="120" align="center"/>
             <el-table-column label="商品名称" align="center" min-width="180">
               <template slot-scope="scope">
                 <el-popover placement="right" width="800" trigger="click">
@@ -204,6 +178,7 @@
                 <el-input v-model="scope.row.remarks" clearable placeholder=""/>
               </template>
             </el-table-column>
+            <el-table-column label="商品ID" prop="goodsID" width="120" align="center"/>
           </el-table>
         </el-form>
       </div>
@@ -304,13 +279,10 @@ export default {
           this.formobj.createBySid = window.sessionStorage.getItem('userSid')
           this.formobj.createByName = window.sessionStorage.getItem('name')
           this.formobj.createTime = getCurrentDate()
-          getOrgSidByPath({
+          getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
-            orgPath: window.sessionStorage.getItem('defaultOrgPath')
-          }).then((res) => {
             if (res.success) {
               this.formobj.createOrgSid = res.data
               this.formobj.useOrgSid = res.data
-              // this.commodityQuery.params.useOrgSid = res.data
             }
           })
         } else {

yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue

@@ -82,12 +82,7 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty">是否外出</div>
-              <el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.isGoOut == '1' ? '是' : '否' }}</span></el-form-item>
-                <el-radio-group v-model="formobj.isGoOut" class="addinputInfo" :disabled="true">
-                  <el-radio :label="'1'">是</el-radio>
-                  <el-radio :label="'2'">否</el-radio>
-                </el-radio-group>
-              </el-form-item>
             </el-col>
           </el-row>
           <el-row>