前端修改sdy

src/views/contractManagement/purchaseContractAdd.vue

@@ -1223,18 +1223,23 @@ export default {
       var that = this
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
-          this.deptBudgetList.sourceProvince =
-            CodeToText[this.selectedOptions[0]]
-          this.deptBudgetList.sourceCity = CodeToText[this.selectedOptions[1]]
-          this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
-          this.deptBudgetList.deliveryProvince =
-            CodeToText[this.selectedOptions1[0]]
-          this.deptBudgetList.deliveryCity =
-            CodeToText[this.selectedOptions1[1]]
-          this.deptBudgetList.deliveryArea =
-            CodeToText[this.selectedOptions1[2]]
+          this.deptBudgetList.sourceProvince = CodeToText[this.selectedOptions[0]]
+          this.deptBudgetList.sourceCity = CodeToText[this.selectedOptions[1]]     
+          this.deptBudgetList.deliveryProvince = CodeToText[this.selectedOptions1[0]]
+          this.deptBudgetList.deliveryCity = CodeToText[this.selectedOptions1[1]]
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 2
+            if(this.deptBudgetList.deliveryProvince =="澳门特别行政区" || this.deptBudgetList.deliveryProvince == "澳门特别行政区"){
+            this.deptBudgetList.deliveryArea = "特别行政区"
+          }else{ 
+             this.deptBudgetList.deliveryArea = CodeToText[this.selectedOptions1[2]]
+          }
+             if(this.deptBudgetList.sourceProvince =="澳门特别行政区" || this.deptBudgetList.sourceProvince == "澳门特别行政区"){
+            this.deptBudgetList.sourceArea = "特别行政区"
+          }else{
+             this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
+          }
+
           addList(this.deptBudgetList)
             .toPromise()
             .then((response) => {

src/views/contractManagement/purchaseContractEdit.vue

@@ -451,7 +451,7 @@
               size="small"
             />
           </ws-form-item>
-        
+
           <ws-form-item
             label="已完成发运量（吨）"
             span="1"
@@ -644,20 +644,31 @@ export default {
           }
           var tmp = []
           tmp[0] = TextToCode[response.sourceProvince].code
+
           tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
-          tmp[2] =
-            TextToCode[response.sourceProvince][response.sourceCity][
-              response.sourceArea
-            ].code
+
+          if (tmp[0] == 810000 || tmp[0] == 820000) {
+            tmp[2] = null
+          } else {
+            tmp[2] =
+              TextToCode[response.sourceProvince][response.sourceCity][
+                response.sourceArea
+              ].code
+          }
           this.selectedOptions = tmp
           var tmp1 = []
           tmp1[0] = TextToCode[response.deliveryProvince].code
           tmp1[1] =
             TextToCode[response.deliveryProvince][response.deliveryCity].code
-          tmp1[2] =
-            TextToCode[response.deliveryProvince][response.deliveryCity][
-              response.deliveryArea
-            ].code
+
+          if (tmp1[0] == 810000 || tmp1[0] == 820000) {
+            tmp1[2] = null
+          } else {
+            tmp1[2] =
+              TextToCode[response.deliveryProvince][response.deliveryCity][
+                response.deliveryArea
+              ].code
+          }
           this.selectedOptions1 = tmp1
           this.deptBudgetList = response
           if (this.deptBudgetList.deliverType == 1) {
@@ -1289,19 +1300,24 @@ export default {
       }
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
-          this.deptBudgetList.sourceProvince =
-            CodeToText[this.selectedOptions[0]]
+          this.deptBudgetList.sourceProvince = CodeToText[this.selectedOptions[0]]
           this.deptBudgetList.sourceCity = CodeToText[this.selectedOptions[1]]
-          this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
-          this.deptBudgetList.deliveryProvince =
-            CodeToText[this.selectedOptions1[0]]
-          this.deptBudgetList.deliveryCity =
-            CodeToText[this.selectedOptions1[1]]
-          this.deptBudgetList.deliveryArea =
-            CodeToText[this.selectedOptions1[2]]
+         
+          this.deptBudgetList.deliveryProvince = CodeToText[this.selectedOptions1[0]]
+          this.deptBudgetList.deliveryCity = CodeToText[this.selectedOptions1[1]]
+        
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 2
-          console.log(this.deptBudgetList)
+           if(this.deptBudgetList.deliveryProvince =="澳门特别行政区" || this.deptBudgetList.deliveryProvince == "澳门特别行政区"){
+            this.deptBudgetList.deliveryArea = "特别行政区"
+          }else{ 
+                 this.deptBudgetList.deliveryArea =  CodeToText[this.selectedOptions1[2]]
+          }
+             if(this.deptBudgetList.sourceProvince =="澳门特别行政区" || this.deptBudgetList.sourceProvince == "澳门特别行政区"){
+            this.deptBudgetList.sourceArea = "特别行政区"
+          }else{
+               this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
+          }
           editInfo(this.deptBudgetList)
             .toPromise()
             .then((response) => {

src/views/contractManagement/salesContractAdd.vue

@@ -1214,18 +1214,27 @@ export default {
       }
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
-          this.deptBudgetList.sourceProvince =
-            CodeToText[this.selectedOptions[0]]
+          this.deptBudgetList.sourceProvince = CodeToText[this.selectedOptions[0]]
           this.deptBudgetList.sourceCity = CodeToText[this.selectedOptions[1]]
-          this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
-          this.deptBudgetList.deliveryProvince =
-            CodeToText[this.selectedOptions1[0]]
-          this.deptBudgetList.deliveryCity =
-            CodeToText[this.selectedOptions1[1]]
-          this.deptBudgetList.deliveryArea =
-            CodeToText[this.selectedOptions1[2]]
+      
+          this.deptBudgetList.deliveryProvince = CodeToText[this.selectedOptions1[0]]
+          this.deptBudgetList.deliveryCity = CodeToText[this.selectedOptions1[1]]
+         
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 1
+
+           if(this.deptBudgetList.deliveryProvince =="澳门特别行政区" || this.deptBudgetList.deliveryProvince == "澳门特别行政区"){
+            this.deptBudgetList.deliveryArea = "特别行政区"
+          }else{ 
+                
+                this.deptBudgetList.deliveryArea = CodeToText[this.selectedOptions1[2]]
+          }
+             if(this.deptBudgetList.sourceProvince =="澳门特别行政区" || this.deptBudgetList.sourceProvince == "澳门特别行政区"){
+            this.deptBudgetList.sourceArea = "特别行政区"
+          }else{
+              this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
+          }
+
           addList(this.deptBudgetList)
             .toPromise()
             .then((response) => {

src/views/contractManagement/salesContractEdit.vue

@@ -577,7 +577,7 @@ export default {
   },
   watch: {
     vesselId(val) {
-      this.getVesselData()
+      this.loaddata()
     },
     isShow(val) {
       this.showType = val
@@ -675,22 +675,30 @@ export default {
           var tmp = []
           tmp[0] = TextToCode[response.sourceProvince].code
           tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
-          tmp[2] =
-            TextToCode[response.sourceProvince][response.sourceCity][
-              response.sourceArea
-            ].code
+          if (tmp[0] == 810000 || tmp[0] == 820000) {
+            tmp[2] = null
+          } else {
+            tmp[2] =
+              TextToCode[response.sourceProvince][response.sourceCity][
+                response.sourceArea
+              ].code
+          }
           this.selectedOptions = tmp
           var tmp1 = []
           tmp1[0] = TextToCode[response.deliveryProvince].code
           tmp1[1] =
             TextToCode[response.deliveryProvince][response.deliveryCity].code
-          tmp1[2] =
-            TextToCode[response.deliveryProvince][response.deliveryCity][
-              response.deliveryArea
-            ].code
+          if (tmp1[0] == 810000 || tmp1[0] == 820000) {
+            tmp1[2] = null
+          } else {
+            tmp1[2] =
+              TextToCode[response.deliveryProvince][response.deliveryCity][
+                response.deliveryArea
+              ].code
+          }
+
           this.selectedOptions1 = tmp1
           this.deptBudgetList = response
-          
         })
       // 包装方式
       packList({ constId: 'CON1' })
@@ -727,10 +735,10 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          if(this.deptBudgetList.deliverType == 1){
-            this.deptBudgetList.deliverType1 = "我方自提"
-          }else if(this.deptBudgetList.deliverType == 2){
-            this.deptBudgetList.deliverType1 = "对方送货" 
+          if (this.deptBudgetList.deliverType == 1) {
+            this.deptBudgetList.deliverType1 = '我方自提'
+          } else if (this.deptBudgetList.deliverType == 2) {
+            this.deptBudgetList.deliverType1 = '对方送货'
           }
           this.unitList = response
           let currItem
@@ -1294,15 +1302,32 @@ export default {
           this.deptBudgetList.sourceProvince =
             CodeToText[this.selectedOptions[0]]
           this.deptBudgetList.sourceCity = CodeToText[this.selectedOptions[1]]
-          this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
+
           this.deptBudgetList.deliveryProvince =
             CodeToText[this.selectedOptions1[0]]
           this.deptBudgetList.deliveryCity =
             CodeToText[this.selectedOptions1[1]]
-          this.deptBudgetList.deliveryArea =
-            CodeToText[this.selectedOptions1[2]]
+
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 1
+
+          if (
+            this.deptBudgetList.deliveryProvince == '澳门特别行政区' ||
+            this.deptBudgetList.deliveryProvince == '澳门特别行政区'
+          ) {
+            this.deptBudgetList.deliveryArea = '特别行政区'
+          } else {
+            this.deptBudgetList.deliveryArea =
+              CodeToText[this.selectedOptions1[2]]
+          }
+          if (
+            this.deptBudgetList.sourceProvince == '澳门特别行政区' ||
+            this.deptBudgetList.sourceProvince == '澳门特别行政区'
+          ) {
+            this.deptBudgetList.sourceArea = '特别行政区'
+          } else {
+            this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
+          }
           editInfo(this.deptBudgetList)
             .toPromise()
             .then((response) => {

src/views/contractManagement/salesContractExamine.vue

@@ -155,10 +155,9 @@
           </ws-form-item>
           
           <ws-form-item label="交货地详细地址" span="1" prop="placeDelivery">
-            <div classs="unchanged">
+            <div class = "unchanged">
                 {{deptBudgetList.placeDelivery}}
             </div>
-
           </ws-form-item>
           <ws-form-item label="签订日期" span="1" prop="signingDate">
             <div class="unchanged">
@@ -286,12 +285,13 @@
         </ws-info-table>
         <div class="remark">
           <h3>备注信息</h3>
+          <div class=" beizhu">
+          {{ deptBudgetList.remarks }}
         </div>
 
-        <div class="unchanged beizhu">
-          {{ deptBudgetList.remarks }}
         </div>
 
+        
         <img :src="deptBudgetList.addressUrl" alt="" />
 
         <!-- </base-card> -->
@@ -361,7 +361,7 @@ export default {
     this.status = this.$route.query.status
     this.loaddata()
     this.showType = this.isShow
-    this.examineList()
+    // this.examineList()
   },
   methods: {
     loaddata() {
@@ -699,10 +699,11 @@ export default {
 /deep/el-date-editor--date {
   width: 200px;
 }
-.beizhu {
-  position: absolute;
-
+/deep/.beizhu {
   margin: 0 auto;
+  font-size: 14px;
+  color: #afb5cb;
+  margin-left: 20px;
 }
 .unchanged {
   position: absolute;

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -414,7 +414,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .container {
-  width: 90%;
+  width: 100%;
   margin: 0 auto;
 }
 .vertical-text-left {

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -394,7 +394,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .container {
-  width: 90%;
+  width: 100%;
   margin: 0 auto;
 }
 .vertical-text-left {

src/views/warehouse/warehouseManagementList.vue

@@ -91,7 +91,7 @@
               style="height: 24px"
               v-for="(item, i) in scope.row.warehouseNumViewList"
             >
-              {{ item.inNetWeight }}
+               {{item.inNetWeight}}
             </div>
           </template>
         </el-table-column>
@@ -168,7 +168,7 @@
               style="height: 24px"
               v-for="(item, i) in scope.row.warehouseNumViewList"
             >
-              {{ item.inNetWeight }}
+               {{ item.goodsName}}({{item.inNetWeight}})
             </div>
           </template>
         </el-table-column>
@@ -178,7 +178,7 @@
               style="height: 24px"
               v-for="(item, i) in scope.row.warehouseNumViewList"
             >
-              {{ item.outNetWeight }}
+             {{ item.goodsName}}({{item.outNetWeight}})
             </div>
           </template>
         </el-table-column>
@@ -417,6 +417,7 @@ export default {
             warehouseName: row.warehouseName,
             binNumber: row.binNumber,
             warehouseType: this.warehouseType,
+            createType: row.createType,
           },
         })
       }

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -31,7 +31,9 @@
             alt=""
           />
           {{ this.$route.query.warehouseName }}库
-          <span class="position" v-show="this.$route.query.warehouseType == 1"> {{ this.$route.query.binNumber }}仓位 </span>
+          <span class="position" v-show="this.$route.query.warehouseType == 1">
+            {{ this.$route.query.binNumber }}仓位
+          </span>
           <span v-show="this.$route.query.warehouseType == 2">(临)</span>
         </h2>
         <el-table :data="improved.records">
@@ -200,8 +202,13 @@ export default {
     this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
     this.binNumber = this.$route.params.binNumber
     this.deptBudgetList.warehouseType = this.$route.query.warehouseType
+    this.createType=this.$route.query.createType,
     //接参
-    this.getList(this.$route.query.baseId, this.$route.query.positionId , this.$route.query.warehouseType)
+    this.getList(
+      this.$route.query.baseId,
+      this.$route.query.positionId,
+      this.$route.query.warehouseType
+    )
     this.showType = this.isShow
   },
   methods: {
@@ -216,60 +223,62 @@ export default {
         this.$router.push({
           path: 'warehouseManagementPerfectput',
           query: {
-             id:row.id,
-             agent:row.agent,
-             baseId: row.baseId,
-             binNumber: row.binNumber,
-             carNo:row.carNo,
-             compId:row.compId,
-             contractNo:row.contractNo,
-             goodsName:row.goodsName,
-             goodsNameKey:row.goodsNameKey,
-             grade:row.grade,
-             grossWeight:row.grossWeight,
-             inOutDate:row.inOutDate,
-             inOutFlag:row.inOutFlag,
-             inOutType:row.inOutType,
-             inOutTypeKey:row.inOutTypeKey,
-             netWeight:row.netWeight,
-             positionId: row.positionId,
-             statusFlag:row.statusFlag,
-             tare:row.tare,
-             warehouseName: row.warehouseName,  
-             warehouseInOutDetail:row.warehouseInOutDetail,
-             warehouseType: this.deptBudgetList.warehouseType
+            id: row.id,
+            agent: row.agent,
+            baseId: row.baseId,
+            binNumber: row.binNumber,
+            carNo: row.carNo,
+            compId: row.compId,
+            contractNo: row.contractNo,
+            goodsName: row.goodsName,
+            goodsNameKey: row.goodsNameKey,
+            grade: row.grade,
+            grossWeight: row.grossWeight,
+            inOutDate: row.inOutDate,
+            inOutFlag: row.inOutFlag,
+            inOutType: row.inOutType,
+            inOutTypeKey: row.inOutTypeKey,
+            netWeight: row.netWeight,
+            positionId: row.positionId,
+            statusFlag: row.statusFlag,
+            tare: row.tare,
+            warehouseName: row.warehouseName,
+            warehouseInOutDetail: row.warehouseInOutDetail,
+            warehouseType: this.deptBudgetList.warehouseType,
+            createType: this.createType
+          
           },
         })
-      } else if(row.inOutFlag==1){
+      } else if (row.inOutFlag == 1) {
         this.$store.dispatch('app/setdeptBudgetList', row)
-      // this.$store.commit('deptBudgetList',row)
+        // this.$store.commit('deptBudgetList',row)
         this.$router.push({
           path: 'warehouseManagementPerfectDelivery',
           query: {
-             id:row.id,
-             agent:row.agent,
-             baseId: row.baseId,
-             binNumber: row.binNumber,
-             carNo:row.carNo,
-             compId:row.compId,
-             contractNo:row.contractNo,
-             goodsName:row.goodsName,
-             goodsNameKey:row.goodsNameKey,
-             grade:row.grade,
-             grossWeight:row.grossWeight,
-             inOutDate:row.inOutDate,
-             inOutFlag:row.inOutFlag,
-             inOutType:row.inOutType,
-             inOutTypeKey:row.inOutTypeKey,
-             netWeight:row.netWeight,
-             positionId: row.positionId,
-             statusFlag:row.statusFlag,
-             tare:row.tare,
-             warehouseName: row.warehouseName,  
-             warehouseInOutDetail:row.warehouseInOutDetail,
-             warehouseType: this.deptBudgetList.warehouseType,
-          }
-          })
+            id: row.id,
+            agent: row.agent,
+            baseId: row.baseId,
+            binNumber: row.binNumber,
+            carNo: row.carNo,
+            compId: row.compId,
+            contractNo: row.contractNo,
+            goodsName: row.goodsName,
+            goodsNameKey: row.goodsNameKey,
+            grade: row.grade,
+            grossWeight: row.grossWeight,
+            inOutDate: row.inOutDate,
+            inOutFlag: row.inOutFlag,
+            inOutType: row.inOutType,
+            inOutTypeKey: row.inOutTypeKey,
+            netWeight: row.netWeight,
+            positionId: row.positionId,
+            statusFlag: row.statusFlag,
+            tare: row.tare,
+            warehouseName: row.warehouseName,
+            warehouseInOutDetail: row.warehouseInOutDetail,
+            warehouseType: this.deptBudgetList.warehouseType,
+          },
+        })
       }
     },
     dateFormat(fmt, date) {
@@ -308,31 +317,31 @@ export default {
       this.getList()
     },
     //收
-    getList(id, id1,id2) { 
-      if(id2==1){
-      complete({
-        // compId: sessionStorage.getItem('ws-pf_compId'),
-        baseId: id,
-        positionId: id1,
-        pageSize: this.pageSize,
-        currentPage: this.currentPage,
-        // inOutDate:this.inOutDate
-      })
-        .toPromise()
-        .then((response) => {
-          this.improved = response
+    getList(id, id1, id2) {
+      if (id2 == 1) {
+        complete({
+          // compId: sessionStorage.getItem('ws-pf_compId'),
+          baseId: id,
+          positionId: id1,
+          pageSize: this.pageSize,
+          currentPage: this.currentPage,
+          // inOutDate:this.inOutDate
         })
-      }else if(id2==2){   
-      completeList({
-        baseId: id,
-        positionId: id1,
-        pageSize: this.pageSize,
-        currentPage: this.currentPage,
-      })
-        .toPromise()
-        .then((response) => {
-          this.improved = response
+          .toPromise()
+          .then((response) => {
+            this.improved = response
+          })
+      } else if (id2 == 2) {
+        completeList({
+          baseId: id,
+          positionId: id1,
+          pageSize: this.pageSize,
+          currentPage: this.currentPage,
         })
+          .toPromise()
+          .then((response) => {
+            this.improved = response
+          })
       }
     },
     handleExamine(row) {
@@ -342,29 +351,32 @@ export default {
       })
     },
     //删除
-      handleDelete(row) {
+    handleDelete(row) {
       this.$confirm(`删除后不可恢复，确认删除？`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
         type: 'warning',
       })
         .then(() => {
-       delInOut({id:row.id})
+          delInOut({ id: row.id })
             .toPromise()
             .then((response) => {
               this.$notify.success({
                 title: '成功',
                 message: '删除成功',
               })
-              this.getList(row.baseId,row.positionId,this.$route.query.warehouseType)
-            })
-            .catch((response) => {
+              this.getList(
+                row.baseId,
+                row.positionId,
+                this.$route.query.warehouseType
+              )
             })
+            .catch((response) => {})
         })
         .catch(() => {
           return false
         })
-      }
+    },
   },
   find() {
     this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -186,7 +186,7 @@
             </ws-select>
           </ws-form-item>
         </ws-info-table>
-        <div warehouseType>
+        <div  v-show="this.$route.query.warehouseType == 2 && this.$route.query.createType == 2">
           <el-checkbox v-model="checked" checked>退库并出库</el-checkbox>
           <ws-info-table v-show="checked == true">
             <!-- 出库类型 -->
@@ -462,6 +462,7 @@ export default {
     this.dataList.statusFlag = this.$route.statusFlag
     this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
     this.deptBudgetList.warehouseType = this.$route.query.warehouseType
+    this.deptBudgetList.createType = this.$route.query.createType
   },
   methods: {
     //返回按钮

src/views/warehouse/warehouseManagementPut.vue

@@ -183,7 +183,7 @@
             </ws-select>
           </ws-form-item>
         </ws-info-table>
-        <div v-show="this.$route.query.warehouseType == 2">
+        <div v-show="this.$route.query.warehouseType == 2 && this.deptBudgetList.createType == 2">
           <el-checkbox v-model="checked" checked>退库并出库</el-checkbox>
           <ws-info-table
             v-show="checked == true && this.deptBudgetList.createType == 2"

src/views/warehouse/warehouseManagementRecord.vue

@@ -191,7 +191,8 @@
           </el-table-column>
           <el-table-column prop="agent" label="经办人">
           </el-table-column>
-          <el-table-column prop="buyer" label="内勤"> </el-table-column>
+          <el-table-column prop="buyer" label="内勤">
+             </el-table-column>
           <el-table-column prop="addressUrl" label="附件">
             <template slot-scope="scope">
               <img
@@ -299,7 +300,7 @@
           </el-table-column>
           <el-table-column prop="agent" label="经办人">
           </el-table-column>
-          <el-table-column prop="buyer" label="内勤"> </el-table-column>
+          <el-table-column prop="backOffice" label="内勤"> </el-table-column>
           <el-table-column prop="addressUrl" label="附件">
             <template slot-scope="scope">
               <img

vue.config.js

@@ -144,7 +144,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.119:8090/',
+        target: 'http://192.168.1.115:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',