x9

build/utils.js

@@ -17,7 +17,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
 let devModules = ['all']
-// let devModules = ['index', 'statisticalReport']
+// let devModules = ['index', 'appoint', 'RMS']
 // let devModules = ['index', 'ADMINISTRATORS']
 
 if (pathSrc.indexOf('node_modules') > -1) {

config/index.js

@@ -73,7 +73,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   '/api/v1': {
     target: 'http://172.16.33.166:80',
-    //target: 'http://localhost:8080',
+    // target: 'http://localhost:8080',
     // target: 'http://192.168.1.104:8080',
     ws: true,
     pathRewrite: {

src/views/appoint/components/saleContract/addSaleOrder.vue

@@ -1055,6 +1055,50 @@ export default {
               })
           }
         })
+    } else if (getCookie('orgCode') == 'chengyunshang') {
+      this.consigneeDisable = true
+      this.axios
+        .post(
+          '/api/v1/uc/getConsigneeInfo?consigneeName=' + getCookie('loginName')
+        )
+        .then(res => {
+          this.consigneeName = res.data.consigneeCompanyName
+          this.consigneeId = res.data.consigneeId
+          //带出摘要
+          this.axios
+            .post('/api/v1/uc/getSaleArea?receiveId=' + this.consigneeId)
+            .then(res => {
+              if (res.data.data != null) {
+                this.remarks = `${this.getRemarkDate()}${res.data.data}`
+                this.remarksPro = `${this.getRemarkDate()}${res.data.data}`
+              }
+            })
+          this.axios
+            .post(
+              '/api/v1/ams/matchingAddressRecently?receiveId=' +
+                this.consigneeId
+            )
+            .then(res => {
+              this.restaurants = res.data.data
+              const place = res.data.data
+              this.saleShipperAddressName =
+                place[0].addressProvince +
+                place[0].addressDistrict +
+                place[0].addressTown +
+                place[0].place
+              this.saleShipperAddressId = place[0].shipperAddressId
+              this.addressId = place[0].shipperAddressId
+              this.place1 = place[0].place
+              this.saleMan = place[0].salerId
+              this.saleOrderConsigneeTel = place[0].saleOrderConsigneeTel
+              this.province = place[0].addressProvince
+              this.city = place[0].addressDistrict
+              if (this.city) {
+                this.remarks = `${this.remarksPro},直发${this.city}`
+              }
+              this.county = place[0].addressTown
+            })
+        })
     }
   },
   methods: {

src/views/appoint/components/saleContract/editSaleOrder.vue

@@ -34,6 +34,7 @@
           :trigger-on-focus="false"
           @select="handleSelectConsignee"
           style="width:300px"
+          :disabled="consigneeDisable"
         >
           <template slot-scope="{ item }">
             <div class="name">{{ item.consigneeCompanyName }}</div>
@@ -689,6 +690,7 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      consigneeDisable: false,
       isCellClick: null,
       truckRemark: '',
       shipperName: '四川省达州钢铁集团有限责任公司',
@@ -957,6 +959,14 @@ export default {
     //获取所有的销售订单信息
     this.getAllSaleMessages()
   },
+  mounted() {
+    if (
+      getCookie('orgCode') == 'shouhuokehu' ||
+      getCookie('orgCode') == 'chengyunshang'
+    ) {
+      this.consigneeDisable = true
+    }
+  },
   methods: {
     getRmsReceivingCompany() {
       this.axios.post('/api/v1/rmsReceivingCompany/map').then(res => {

src/views/appoint/components/saleContract/saleOrderSteel.vue

@@ -46,7 +46,7 @@
           <el-button
             type="primary"
             @click="batchReport"
-            v-if="activeName == 'first'"
+            v-if="activeName == 'first' && isShow"
           >
             <i class="upload2"></i>批量上传
           </el-button>
@@ -137,6 +137,7 @@
                   @click="uploadclick(scope.row.saleOrderId)"
                   type="text"
                   size="small"
+                  v-if="isShow"
                   >上传</el-button
                 >
                 <el-button
@@ -162,7 +163,7 @@
           </mergeRowTable>
         </el-tab-pane>
         <!-- 已审批 -->
-        <el-tab-pane label="已审批" name="four">
+        <el-tab-pane label="已审批" name="four" v-if="isShow">
           <mergeRowTable
             v-bind.sync="option4"
             ref="table"
@@ -204,7 +205,7 @@
             </el-table-column>
           </mergeRowTable>
         </el-tab-pane>
-        <el-tab-pane label="反审批" name="five">
+        <el-tab-pane label="反审批" name="five" v-if="isShow">
           <mergeRowTable v-bind.sync="option5" ref="table2" :pageSize="200">
             <el-table-column
               fixed="right"
@@ -224,7 +225,7 @@
           >
         </el-tab-pane>
         <!-- 已上报 -->
-        <el-tab-pane label="已上报" name="second">
+        <el-tab-pane label="已上报" name="second" v-if="isShow">
           <mergeRowTable
             v-bind.sync="option2"
             ref="table2"
@@ -271,6 +272,7 @@ export default {
   },
   data() {
     return {
+      isShow: false,
       dialogTableVisible: false,
       startTime: null,
       endTime: null,
@@ -397,20 +399,8 @@ export default {
         getCookie('userId') +
         '&i=' +
         new Date()
-      this.option2.requestUrl =
-        '/api/v1/ams/getSaleOrderReportedes?apiId=408&consigneeSsoId=' +
-        getCookie('userId') +
-        '&i=' +
-        new Date()
-      this.option4.requestUrl =
-        '/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&saleType=1&consigneeSsoId=' +
-        getCookie('userId')
-      this.option5.requestUrl =
-        '/api/v1/ams/getSteelOrderDeletedList?apiId=409&consigneeSsoId=' +
-        getCookie('userId') +
-        '&i=' +
-        new Date()
     } else if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
+      this.isShow = true
       this.option.requestUrl =
         '/api/v1/ams/getSaleOrderInfoes?apiId=408&saler=' +
         getCookie('loginName') +
@@ -429,7 +419,17 @@ export default {
       this.option5.requestUrl =
         '/api/v1/ams/getSteelOrderDeletedList?apiId=409&saler=' +
         getCookie('loginName')
+    } else if (getCookie('orgCode') == 'chengyunshang') {
+      this.option.requestQuery = {
+        consigneeName: getCookie('loginName')
+      }
+      this.option.requestUrl =
+        '/api/v1/ams/getSaleOrderInfoes?apiId=408&consigneeSsoId=' +
+        null +
+        '&i=' +
+        new Date()
     } else {
+      this.isShow = true
       this.option.requestUrl =
         '/api/v1/ams/getSaleOrderInfoes?apiId=408&consigneeSsoId=' +
         null +

src/views/statisticalReport/components/salesLogisticsStatistics/unloadingSteelReports.vue

@@ -657,7 +657,6 @@ export default {
               e.saleRemark =
                 this.remarkDateNew + e.saleRemark.split(this.remarkDateOld)[1]
             }
-
             map.saleMaterialId = e.saleMaterialId
             map.closeEntryId = e.closeEntryId
             map.number = e.saleOrderNo