Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/VehicleOrderListVo.java

@@ -44,4 +44,7 @@ public class VehicleOrderListVo implements Vo {
 
     @ApiModelProperty("下线日期")
     private String offlineDate;
+
+    @ApiModelProperty("排产申请编号")
+    private String applicationCode;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml

@@ -4,11 +4,10 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.busvehicleorder.VehicleOrderListVo">
-        SELECT bvo.*, bvm.modelName
+        SELECT bvo.*, bvm.modelName,bva.applicationCode
         FROM bus_vehicle_order bvo
-                 LEFT JOIN base_vehicle_model bvm ON bvo.purchaseApplyMediumModelSid = bvm.sid
-                 LEFT JOIN bus_vehicle_apply_detail bvad ON bvo.purchaseApplyMediumModelSid = bvad.sid
-                 LEFT JOIN bus_vehicle_apply bva ON bvad.applySid = bva.sid
+        LEFT JOIN base_vehicle_model bvm ON bvo.purchaseApplyMediumModelSid = bvm.sid
+        LEFT JOIN bus_vehicle_apply bva ON bva.sid = bvo.purchaseRequisitionSid
         <where>
             ${ew.sqlSegment}
         </where>

anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue

@@ -57,7 +57,7 @@
                 <span>{{ scope.row.follow_time }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="跟进效果" align="center">
+            <el-table-column label="跟进结果" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.follow_result }}</span>
               </template>

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue

@@ -14,7 +14,7 @@
         <div v-show="isSearchShow" class="search">
           <el-form :inline="true" class="tab-header">
             <el-form-item label="订单编号">
-              <el-input v-model="queryParams.params.orderNo" placeholder="请输入单据编号" clearable/>
+              <el-input v-model="queryParams.params.orderNo" placeholder="请输入编号" clearable/>
             </el-form-item>
             <el-form-item label="订单类型">
               <el-select v-model="queryParams.params.orderTypeKey" @change="changeBillType" style="width:200px" filterable placeholder="请选择" clearable>
@@ -22,7 +22,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="状态">
-              <el-input v-model="queryParams.params.orderStatus" placeholder="请输入单据编号" clearable/>
+              <el-input v-model="queryParams.params.orderStatus" placeholder="请输入状态" clearable/>
             </el-form-item>
             <el-form-item label="申请日期">
               <div class="block">
@@ -36,7 +36,7 @@
               </div>
             </el-form-item>
             <el-form-item label="车型" class="search_label">
-              <el-input v-model="queryParams.params.modelName" placeholder="请输入单据编号" clearable/>
+              <el-input v-model="queryParams.params.modelName" placeholder="请输入车型" clearable/>
             </el-form-item>
             <el-divider/>
             <div class="btn" style="text-align: center;">
@@ -55,22 +55,23 @@
       <!--Start 项目列表-->
       <div class="listcon">
         <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
-          <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+          <el-table-column width="60px" label="序号" type="index" :index="indexMethod" align="center"/>
           <el-table-column label="操作" align="center">
             <template slot-scope="scope">
               <el-button type="primary" size="small" @click="handleUpdate(scope.row)">编辑</el-button>
               <el-button type="primary" size="small" @click="handleLooK(scope.row)">查看</el-button>
             </template>
           </el-table-column>
-          <el-table-column prop="orderStatus" label="采购订单状态" align="center"/>
-          <el-table-column prop="orderNo" label="采购订单编号" align="center"/>
-          <el-table-column prop="orderDate" label="采购订单日期" align="center"/>
-          <el-table-column prop="orderType" label="采购订单类型" align="center"/>
+          <el-table-column prop="orderStatus" label="采购订单状态" align="center" width="120px"/>
+          <el-table-column prop="orderNo" label="采购订单编号" align="center" width="180px"/>
+          <el-table-column prop="orderDate" label="采购订单日期" align="center" width="100px"/>
+          <el-table-column prop="orderType" label="采购订单类型" align="center" width="120px"/>
+          <el-table-column prop="applicationCode" label="排产申请编号" align="center" width="180px"/>
           <el-table-column prop="modelName" label="车型" align="center"/>
-          <el-table-column prop="platformNo" label="台数" align="center"/>
-          <el-table-column prop="expectLaunchDate" label="预期上线时间" align="center"/>
-          <el-table-column prop="launchDate" label="上线日期" align="center"/>
-          <el-table-column prop="offlineDate" label="下线日期" align="center"/>
+          <el-table-column prop="platformNo" label="台数" align="center" width="70px"/>
+          <el-table-column prop="expectLaunchDate" label="预期上线时间" align="center" width="100px"/>
+          <el-table-column prop="launchDate" label="上线日期" align="center" width="100px"/>
+          <el-table-column prop="offlineDate" label="下线日期" align="center" width="100px"/>
         </el-table>
       </div>
       <!--End 项目列表-->

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigouAdd.vue

@@ -85,7 +85,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4" class="tleftb">
-            <span>入库价格</span>
+            <span>入库合同单价</span>
           </el-col>
           <el-col :span="8" class="trightb">
             <el-form-item>

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigouInfo.vue

@@ -40,7 +40,7 @@
         <el-row>
           <el-col :span="4" class="tleftb">上装价格</el-col>
           <el-col :span="8" class="trightb">{{ formobj.coatPrice }}</el-col>
-          <el-col :span="4" class="tleftb">入库价格</el-col>
+          <el-col :span="4" class="tleftb">入库合同单价</el-col>
           <el-col :span="8" class="trightb">{{ formobj.treasuryPrice }}</el-col>
         </el-row>
         <el-row>

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue

@@ -91,8 +91,8 @@
       </div>
       <div class="">
         <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
-          <el-table-column width="50px" type="selection" align="center"/>
           <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+          <el-table-column width="50px" type="selection" align="center"/>
           <el-table-column label="操作" align="center" width="110px" class-name="small-padding fixed-width">
             <template slot-scope="{row}">
               <el-button size="mini" type="primary" @click="handlePeizhi(row)">车型配置</el-button>

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue

@@ -65,16 +65,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row class="linethree">
-            <el-col :span="3" class="el-form-item-right">
-              <el-form-item label="备注:"></el-form-item>
-            </el-col>
-            <el-col :span="21">
-              <el-form-item>
-                <el-input v-model="formobj.remarks" clearable/>
-              </el-form-item>
-            </el-col>
-          </el-row>
           <div class="tableStyle">
             <div style="margin-left: 5px;font-weight: bold">车辆列表</div>
           </div>
@@ -103,6 +93,16 @@
               </el-col>
             </el-col>
           </el-row>
+          <el-row class="linethree">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="备注:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.remarks" clearable/>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
     </div>
@@ -167,17 +167,18 @@ export default {
               vinNo: e.vinNo
             })
           })
-        } else {
-          for (var i = 0; i < row[0].vehicleNum; i++) {
-            this.formobj.vehicleList.push({
-              applySid: '',
-              remarks: '',
-              modelSid: this.formobj.modelSid,
-              sid: '',
-              vinNo: ''
-            })
-          }
         }
+        // else {
+        //   for (var i = 0; i < row[0].vehicleNum; i++) {
+        //     this.formobj.vehicleList.push({
+        //       applySid: '',
+        //       remarks: '',
+        //       modelSid: this.formobj.modelSid,
+        //       sid: '',
+        //       vinNo: ''
+        //     })
+        //   }
+        // }
       }).catch((e) => {
         this.formobj = row
       })

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue

@@ -61,16 +61,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row class="linetwo">
-            <el-col :span="3" class="el-form-item-right">
-              <el-form-item label="备注:"></el-form-item>
-            </el-col>
-            <el-col :span="21">
-              <el-form-item>
-                <el-input v-model="formobj.remarks" clearable readonly/>
-              </el-form-item>
-            </el-col>
-          </el-row>
           <div class="tableStyle">
             <div style="margin-left: 5px;font-weight: bold">车辆列表</div>
           </div>
@@ -99,6 +89,16 @@
               </el-col>
             </el-col>
           </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="备注:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.remarks" clearable readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
     </div>

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue

@@ -50,7 +50,7 @@
           <el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
           <el-table-column width="150" label="操作" align="center">
             <template slot-scope="scope">
-              <el-button type="primary" size="small" :disabled="scope.row.nodeState =='' ? false : scope.row.nodeState == '填写入账申请' ? false : true" @click="toEdit(scope.row)">办理</el-button>
+              <el-button type="primary" size="small" :disabled="scope.row.nodeState === '待提交' ? false : true" @click="toEdit(scope.row)">办理</el-button>
               <el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
             </template>
           </el-table-column>
@@ -135,18 +135,17 @@ export default {
       this.sides = this.sids.join() // 将sid数组的元素转化成字符串
       console.log('获取sids数组', this.sids)
     },
-    toEdit() {
-      if (this.sids.length === 0) {
-        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
-        return
-      }
-      if (this.sids.length > 1) {
-        this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
-        return
-      }
+    toEdit(row) {
+      // if (this.sids.length === 0) {
+      //   this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
+      //   return
+      // }
+      // if (this.sids.length > 1) {
+      //   this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
+      //   return
+      // }
       this.viewState = 3
-      const sid = this.sids[0]
-      const row = this.row
+      const sid = row.sid
       this.$refs['divadd'].showEdit(sid, row)
     },
     toInfo(row) {

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

@@ -65,16 +65,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row class="linethree">
-            <el-col :span="3" class="el-form-item-right">
-              <el-form-item label="备注:"></el-form-item>
-            </el-col>
-            <el-col :span="21">
-              <el-form-item>
-                <el-input v-model="formobj.remarks" clearable/>
-              </el-form-item>
-            </el-col>
-          </el-row>
           <div class="tableStyle">
             <div style="margin-left: 5px;font-weight: bold">车辆列表</div>
           </div>
@@ -103,6 +93,16 @@
               </el-col>
             </el-col>
           </el-row>
+          <el-row class="linethree">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="备注:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.remarks" clearable/>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
     </div>

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangInfo.vue

@@ -65,16 +65,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row class="linetwo">
-            <el-col :span="3" class="el-form-item-right">
-              <el-form-item label="备注:"></el-form-item>
-            </el-col>
-            <el-col :span="21">
-              <el-form-item>
-                <el-input v-model="formobj.remarks" clearable readonly/>
-              </el-form-item>
-            </el-col>
-          </el-row>
           <div v-show="transactState=='00'">
             <!--          <div class="diaTitle"><i class="el-icon-chat-line-square"></i><span>审批意见</span></div>-->
             <el-form :model="dialogList" :inline="true" label-width="80px">
@@ -115,6 +105,16 @@
               </el-col>
             </el-col>
           </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="备注:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.remarks" clearable readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
     </div>