Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue

@@ -11,6 +11,12 @@
               <el-form-item label="订单状态">
                 <el-input v-model="listQuery.params.nodeState" clearable placeholder="" />
               </el-form-item>
+              <el-form-item label="采购系统">
+                <el-input v-model="listQuery.params.purchaseSystemName" clearable placeholder="" />
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customerName" clearable placeholder="" />
+              </el-form-item>
               <el-form-item label="车型">
                 <el-input v-model="listQuery.params.modelName" clearable placeholder="" />
               </el-form-item>
@@ -48,6 +54,16 @@
                 <el-button type="primary" v-show="scope.row.printOrderBtn" size="mini" @click="handlePrint(scope.row)">下载打印</el-button>
               </template>
             </el-table-column>
+            <el-table-column label="分公司" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.useOrgName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="采购系统" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.purchaseSystemName }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="订单编号" width="100px" align="center">
               <template slot-scope="scope">
                 <span class="bluezi" @click="handleLook(scope.row)">{{ scope.row.saleOrderId }}</span>
@@ -58,6 +74,21 @@
                 <span>{{ scope.row.contractId }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="排产订单编号" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.orderingNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="贴息" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.factoryDiscount }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="中介返利" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.distributorPriceAll }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="车架号" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.vinNo }}</span>
@@ -73,6 +104,11 @@
                 <span>{{ scope.row.mobile }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="销售部门" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.orgName }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="销售专员" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.saler }}</span>
@@ -186,7 +222,9 @@ export default {
           contractNo: '',
           createByName: '',
           createByDept: '',
-          saleTypeKey: ''
+          saleTypeKey: '',
+          customerName: '',
+          purchaseSystemName: ''
         },
         current: 1,
         size: 10,
@@ -308,7 +346,9 @@ export default {
           contractNo: '',
           createByName: '',
           createByDept: '',
-          saleTypeKey: ''
+          saleTypeKey: '',
+          customerName: '',
+          purchaseSystemName: ''
         },
         current: 1,
         size: 10,

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/customerBillingDetails.vue

@@ -190,7 +190,7 @@ export default {
     getList() {
       this.listLoading = true
       this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
-      this.listQuery.params.createBySid = window.sessionStorage.getItem('staffSid')
+      this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
       this.listQuery.params.menuUrl = this.$route.path
       customerBillDetailedListPage(this.listQuery).then((response) => {
         this.listLoading = false

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue

@@ -75,6 +75,36 @@
                 <span>{{ scope.row.createOrgName }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="采购系统" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.purchaseSystemName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="排产订单编号" align="center" width="130">
+              <template slot-scope="scope">
+                <span>{{ scope.row.orderingNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="订单状态" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.nodeState }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="贴息" align="center" width="90">
+              <template slot-scope="scope">
+                <span>{{ scope.row.factoryDiscount }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="中介返利" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.distributorPriceAll }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.kpType }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="物料名称" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.materialName }}</span>

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

@@ -908,24 +908,31 @@ export default {
           hint1 = 0
         })
       } else {
-        this.$refs['form_obj'].validate(valid => {
-          if (valid) {
-            this.submitdisabled = true
-            req.confirmRZ(this.formobj).then((res) => {
-              if (res.success) {
-                this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: '提交成功'
-                })
-                this.handleReturn('true')
-              } else {
+        const tip = '请再次确认录入信息，提交后将直接推送金蝶数据！'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$refs['form_obj'].validate(valid => {
+            if (valid) {
+              this.submitdisabled = true
+              req.confirmRZ(this.formobj).then((res) => {
+                if (res.success) {
+                  this.$message({
+                    showClose: true,
+                    type: 'success',
+                    message: '提交成功'
+                  })
+                  this.handleReturn('true')
+                } else {
+                  this.submitdisabled = false
+                }
+              }).catch(() => {
                 this.submitdisabled = false
-              }
-            }).catch(() => {
-              this.submitdisabled = false
-            })
-          }
+              })
+            }
+          })
         })
       }
     },