Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

public/static/payprint.html

@@ -124,7 +124,7 @@
       }
       .header1 {
         font-size: 24px;
-        margin: 60px 60px 10px 60px;
+        margin: 30px 60px 10px 60px;
         display: flex;
         justify-content: center;
       }

public/static/weightCheck.html

@@ -20,7 +20,7 @@
 
       .content {
         width: 1000px;
-        padding: 70px 20px 20px 20px;
+        padding: 30px 20px 20px 20px;
         font-size: 18px;
         position: absolute;
         top: 0;

src/api/V2/houseSelfCollect/index.js

@@ -27,7 +27,7 @@ export const API_POST_CUSTOMER_EDIT = '/identityAuthenticationInfo/api/editIdent
 //客户获取验证码
 export const API_GET_CUSTOMER_CODE = '/commonUser/sendVerifyCode'
 //客户验证码校验
-export const API_GET_CUSTOMER_CODEJY = '/commonUser/loginVerifyCode'
+export const API_GET_CUSTOMER_CODEJY = '/commonUser/checkVerifyCode'
 //质检添加
 export const API_POST_INSPECT_ADD = '/qualityInspectionManagement/api/addQualityInspection'
 //质检仓位下拉

src/views/contractManagement/salesContractAdd.vue

@@ -338,7 +338,7 @@
         :size-limit="size"
         @onChange="onChange" 
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" 
-        v-hasPermission="`contractManagement.salesContractsalesContractInfo.appl`"/>
+        v-hasPermission="`contractManagement.salesContract.salesContractInfo.appl`"/>
       </ws-form>
       <div v-if="dialogVisible" class="map">
         <map-drag @marker="marker" :isShowaddress="true" v-on:addressListen="getAddress" :type="type">

src/views/contractManagement/salesContractEdit.vue

@@ -342,7 +342,7 @@
           maxlength="200" />
         <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
           @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" v-hasPermission="
-            `contractManagement.salesContractsalesContractInfo.appl`"/>
+            `contractManagement.salesContract.salesContractInfo.appl`"/>
       </ws-form>
     </div>
     <div v-if="dialogVisible" class="map">

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -10,7 +10,7 @@
       <div>No.</div>
     </div>
     <div class="header-top">
-      <div>开票日期：{{printData.currentTime}}</div>
+      <div>开票日期：{{printData.createDate}}</div>
       <!-- <div>开票日期：{{new Date(yyyy,mm,dd)}}</div> -->
       <div class="number">{{dealNo(printData.paymentNo)}}</div>
     </div>

src/views/houseSelfCollect/inspectInfo.vue

@@ -62,7 +62,7 @@
                 disabled />
             </ws-form-item>
             <ws-form-item label="类型" span="1" prop="type">
-              <ws-select v-model="inspect.type" disabled @change="typeChange">
+              <ws-select v-model="inspect.type" :disabled="disabled2" @change="typeChange">
                 <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
               </ws-select>
             </ws-form-item>
@@ -71,7 +71,7 @@
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="净重单价（元/公斤）" span="1" prop="tidalGrainPrice" v-if="inspect.type == '潮粮'">
-              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.tidalGrainPrice" placeholder="请输入净重单价" maxlength="10" size="small" disabled />
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.tidalGrainPrice" placeholder="请输入净重单价" maxlength="10" size="small" :disabled="disabled2" />
             </ws-form-item>
             <ws-form-item label="干粮单价（元/公斤）" span="1" prop="dryGrainPrice" v-if="inspect.type == '干粮'">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.dryGrainPrice" placeholder="请输入干粮单价" maxlength="10" size="small"  :disabled="disabled" />
@@ -175,6 +175,7 @@
         },
         disabled: false,
         disabled1: false,
+        disabled2: false,
         types: '1',
         information: '添加初检',
         goodNameList: [],
@@ -192,11 +193,18 @@
         imgUrl:'',
         printData:{},
         num:0,
-        tipFlag:true
+        tipFlag:true,
+        allowEdit:0,
       }
     },
     activated() {
       this.types = this.$route.query.type
+      this.allowEdit = this.$route.query.allowEdit
+      if (this.allowEdit == 0) {
+        this.disabled2 = true
+      } else if (this.allowEdit == 1) {
+        this.disabled2 = false
+      }
       if(!this.types){
           this.types = 1
            this.information = '添加初检'

src/views/houseSelfCollect/paymentManagement.vue

@@ -125,7 +125,7 @@
           <span v-else>{{ scope.row.status }}</span>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="200">
+      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="260">
         <template scope="scope">
           <span v-hasPermission="`acquisitionManagement.acquisitionPay.add`">
             <el-button
@@ -135,13 +135,8 @@
                     scope.row.status == '待结算'
                   "
               @click="settlement(1, scope.row)"
-            >结算</el-button>
-                      <el-button
-            
-              @click="settlement(1, scope.row)"
             >结算</el-button>
           </span>
-
           <el-button
             v-if="scope.row.approveStatus || scope.row.status == '已驳回'"
             @click="settlement(2, scope.row)"
@@ -337,18 +332,45 @@ export default {
   },
   methods: {
     invoicingClick(){
-      
       let data = JSON.stringify({
         paymentManagement :this.modification
       })
-      console.log("开票",data)
+      console.log('开票',data)
       //开票
-        invoicing(data)
-        .toPromise()
-        .then(response => {
-          console.log(response)
-    
-        })
+      invoicing(data)
+      .toPromise()
+      .then(response => {
+        console.log(response)
+        //未完成，接口调通后替换假数据
+        response = {
+
+        }
+        response.data.imgList = [
+          {
+            name:'xml1',
+            src: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png"
+          },
+            {
+            name:'xml2',
+            src: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png"
+          },  {
+            name:'xml3',
+            src: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png"
+          }
+         ]
+        this.invoicingImgList = response.data.imgList
+        if(response.data.imgList.length>0){
+          for(let i = 0;i<response.data.imgList;i++){
+          //创建标签下载文件
+            let a = document.createElement("a");
+            a.href = response.data.imgList[i].src;
+            let urlArr = a.href.split(".");
+            a.setAttribute('download',response.data.imgList[i].name+".xml");
+            a.click();
+            a.remove();
+          }
+        }
+      })
     },
     selectType(val) {
       console.log(val)
@@ -507,7 +529,8 @@ export default {
         searchKeyWord: this.searchKeyWord,
         searchType: searchParam,
         warehouseName: this.warehouseName,
-        managementType: 1
+        managementType: 1,
+        compId: sessionStorage.getItem('ws-pf_compId')
       })
         .toPromise()
         .then(response => {

src/views/houseSelfCollect/weightCheck.vue

@@ -203,7 +203,7 @@
           tare: 0,
           buckleMiscellaneous: 0,
         },
-        tpyeNo: '',
+        tpyeNo: 1,
         disabled: true,
         relationId: '',
         warehouseId: '',
@@ -216,7 +216,9 @@
         monitorUrl2: '',
         cangid: '',
         paramType: '1',
-        warehouseName: ''
+        warehouseName: '',
+        result1: '00',
+        allowEdit:0
       }
     },
     activated() {
@@ -280,7 +282,7 @@
         getweighingList({
             compId: sessionStorage.getItem('ws-pf_compId'),
             currentPage: this.currentPage,
-            pageSize: this.pageSize,
+            pageSize: 100,
             searchKeyWord: '',
             warehouseName: sessionStorage.getItem('ck'),
             managementType: 1
@@ -450,7 +452,8 @@
             // var receData = HexConvert.ByteToString(value);
             // console.log("receData",receData);
             var flag = false;
-            if (this.warehouseName && this.warehouseName == '山东诸城迈饶库') {
+            var flag1 = false;
+            if (this.warehouseName && (this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库')) {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '+') {
@@ -470,31 +473,38 @@
                 }
               }
             } else {
-              for (var i = 0; i < value.length; i++) {
+              for(var i=0;i<value.length;i++){
                 var tmp = String.fromCharCode(value[i])
-                if (value[0] != 49 && value[0] != 2) {
-                  break
+                
+                if((value[0] != 49 && value[0] != 2)){
+                  if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                    flag1 = true
+                  }
+                  else{
+                    break
+                  }
                 }
-                if (tmp == String.fromCharCode(32)) {
+                if (tmp == String.fromCharCode(32) ) {
                   flag = true
                 }
-                if (flag && result.length < 7 && tmp != String.fromCharCode(32)) {
-                  // if(i-1 >=0 &&tmp == String.fromCharCode(48) && value[i-1] == 32){
-                  //   continue
-                  // }
-                  // if(i-2 >=0 &&tmp == String.fromCharCode(48) && value[i-2] == 32){
-                  //   continue
-                  // }
+                if (flag && result.length < 7 && tmp != String.fromCharCode(32)&&!(value[value.length-1] == 48&&value[value.length-2] == 48)) {
                   result += tmp
                 }
+                if (flag1 && tmp != String.fromCharCode(32)) {
+                  if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                    if(i == 0 ){
+                      this.result1 = tmp + '0'
+                    }
+                  }
+                }
               }
               if (this.tpyeNo != 2) {
                 if (parseInt(result) || parseInt(result) == 0) {
-                  this.weighingList.grossWeight = parseInt(result) * 100
+                  this.weighingList.grossWeight =  parseInt(result+this.result1)
                 }
               } else {
                 if (parseInt(result) || parseInt(result) == 0) {
-                  this.weighingList.tare = parseInt(result) * 100
+                  this.weighingList.tare =  parseInt(result+this.result1)
                 }
               }
             }

src/views/outboundManagement/weighing.vue

@@ -213,7 +213,7 @@
 				// else{
 				// 	this.weighingList.tare = parseInt(result) 
 				// }
-				if(this.warehouseName&&this.warehouseName == '山东诸城迈饶库'){
+				if(this.warehouseName&&(this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库')){
 					for (var i = 0; i < value.length; i++) {
 						var tmp = String.fromCharCode(value[i])
 						if (tmp == '+') {

src/views/warehouse/warehouseManagementGross.vue

@@ -652,6 +652,8 @@ export default {
         addressUrl:'',
         warehouseInOutDetail: {},
         deductionAmount:0,
+        grossWeight:0,
+        tare:0
       },
       historyList: [],
       cost:'',
@@ -663,7 +665,8 @@ export default {
       accessoryTFs: false,
       allowEdit: true,
       param: 9600,
-      information:''
+      information:'',
+      result1 : '00'
     }
   },
   mounted() {
@@ -738,6 +741,7 @@ export default {
           // var receData = HexConvert.ByteToString(value);
           // console.log("receData",receData);
           var flag = false;
+          var flag1 = false;
           // for (var i = 0; i < value.length; i++) {
           //   var tmp = String.fromCharCode(value[i])
           //   if (tmp == '+') {
@@ -757,18 +761,17 @@ export default {
           //   }
           // }
           console.log('value:',value);
-
-          if(this.warehouseName&&this.warehouseName == '山东诸城迈饶库'){
+          if(this.deptBudgetList.warehouseName&&(this.deptBudgetList.warehouseName == '山东诸城迈饶库'||this.deptBudgetList.warehouseName == '克东千红库')){
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
               if (tmp == '+') {
-              flag = true
+                flag = true
               }
               if (flag && result.length < 6 && tmp != '+') {
-              result += tmp
+                result += tmp
               }
             }
-            if (this.information != '毛重检斤') {
+            if (this.information == '毛重检斤') {
               if(parseInt(result)|| parseInt(result) == 0){
                 this.deptBudgetList.grossWeight = parseInt(result)
               }
@@ -781,29 +784,36 @@ export default {
           else{
             for(var i=0;i<value.length;i++){
               var tmp = String.fromCharCode(value[i])
-              if(value[0] != 49 && value[0] != 2){
-              break
+              
+              if((value[0] != 49 && value[0] != 2)){
+                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                  flag1 = true
+                }
+                else{
+                  break
+                }
               }
               if (tmp == String.fromCharCode(32) ) {
-              flag = true
+                flag = true
               }
-              if (flag && result.length < 7 && tmp != String.fromCharCode(32)) {
-              // if(i-1 >=0 &&tmp == String.fromCharCode(48) && value[i-1] == 32){
-              //   continue
-              // }
-              // if(i-2 >=0 &&tmp == String.fromCharCode(48) && value[i-2] == 32){
-              //   continue
-              // }
-              result += tmp
+              if (flag && result.length < 7 && tmp != String.fromCharCode(32)&&!(value[value.length-1] == 48&&value[value.length-2] == 48)) {
+                result += tmp
+              }
+              if (flag1 && tmp != String.fromCharCode(32)) {
+                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                  if(i == 0 ){
+                    this.result1 = tmp + '0'
+                  }
+                }
               }
             }
-            if (this.information != '毛重检斤') {
+            if (this.information == '毛重检斤') {
               if(parseInt(result)|| parseInt(result) == 0){
-              this.deptBudgetList.grossWeight = parseInt(result)*100
+              this.deptBudgetList.grossWeight = parseInt(result+this.result1)
               }
             } else {
               if(parseInt(result)|| parseInt(result) == 0){
-              this.deptBudgetList.tare = parseInt(result)*100
+              this.deptBudgetList.tare = parseInt(result+this.result1)
               }
             }
           }

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -594,7 +594,8 @@ export default {
       },
       accessoryTFs: false,
       param: 9600,
-      allowEdit:true
+      allowEdit:true,
+      result1:'00'
     }
   },
   activated() {
@@ -688,6 +689,7 @@ export default {
           // var receData = HexConvert.ByteToString(value);
           // console.log("receData",receData);
           var flag = false;
+          var flag1 = false;
           // for (var i = 0; i < value.length; i++) {
           //   var tmp = String.fromCharCode(value[i])
           //   if (tmp == '+') {
@@ -700,7 +702,7 @@ export default {
           // if(parseInt(result)){
           //     this.dataList.tare = parseInt(result)
           // }
-          if(this.warehouseName&&this.warehouseName == '山东诸城迈饶库'){
+          if(this.deptBudgetList1.warehouseName&&(this.deptBudgetList.warehouseName == '山东诸城迈饶库'||this.deptBudgetList.warehouseName == '克东千红库')){
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
               if (tmp == '+') {
@@ -717,24 +719,31 @@ export default {
           else{
             for(var i=0;i<value.length;i++){
               var tmp = String.fromCharCode(value[i])
-              if(value[0] != 49 && value[0] != 2){
-              break
+              
+              if((value[0] != 49 && value[0] != 2)){
+                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                  flag1 = true
+                }
+                else{
+                  break
+                }
               }
               if (tmp == String.fromCharCode(32) ) {
-              flag = true
+                flag = true
               }
-              if (flag && result.length < 7 && tmp != String.fromCharCode(32)) {
-              // if(i-1 >=0 &&tmp == String.fromCharCode(48) && value[i-1] == 32){
-              //   continue
-              // }
-              // if(i-2 >=0 &&tmp == String.fromCharCode(48) && value[i-2] == 32){
-              //   continue
-              // }
-              result += tmp
+              if (flag && result.length < 7 && tmp != String.fromCharCode(32)&&!(value[value.length-1] == 48&&value[value.length-2] == 48)) {
+                result += tmp
+              }
+              if (flag1 && tmp != String.fromCharCode(32)) {
+                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                  if(i == 0 ){
+                    this.result1 = tmp + '0'
+                  }
+                }
               }
             }
             if(parseInt(result)|| parseInt(result) == 0){
-              this.dataList.tare = parseInt(result)*100
+              this.dataList.tare = parseInt(result+this.result1)
             }
           }
           setTimeout(1000)

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -506,7 +506,8 @@ export default {
       },
       accessoryTFs: false,
       param: 9600,
-      allowEdit:true
+      allowEdit:true,
+      result1:'00'
     }
   },
   activated() {
@@ -581,6 +582,7 @@ export default {
           // var receData = HexConvert.ByteToString(value);
           // console.log("receData",receData);
           var flag = false;
+          var flag1 = false;
           // for (var i = 0; i < value.length; i++) {
           //   var tmp = String.fromCharCode(value[i])
           //   if (tmp == '+') {
@@ -593,7 +595,7 @@ export default {
           // if(parseInt(result)){
           //     this.dataList.grossWeight = parseInt(result)
           // }
-          if(this.warehouseName&&this.warehouseName == '山东诸城迈饶库'){
+          if(this.deptBudgetList1.warehouseName&&(this.deptBudgetList.warehouseName == '山东诸城迈饶库'||this.deptBudgetList.warehouseName == '克东千红库')){
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
               if (tmp == '+') {
@@ -610,24 +612,31 @@ export default {
           else{
             for(var i=0;i<value.length;i++){
               var tmp = String.fromCharCode(value[i])
-              if(value[0] != 49 && value[0] != 2){
-              break
+              
+              if((value[0] != 49 && value[0] != 2)){
+                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                  flag1 = true
+                }
+                else{
+                  break
+                }
               }
               if (tmp == String.fromCharCode(32) ) {
-              flag = true
+                flag = true
               }
-              if (flag && result.length < 7 && tmp != String.fromCharCode(32)) {
-              // if(i-1 >=0 &&tmp == String.fromCharCode(48) && value[i-1] == 32){
-              //   continue
-              // }
-              // if(i-2 >=0 &&tmp == String.fromCharCode(48) && value[i-2] == 32){
-              //   continue
-              // }
-              result += tmp
+              if (flag && result.length < 7 && tmp != String.fromCharCode(32)&&!(value[value.length-1] == 48&&value[value.length-2] == 48)) {
+                result += tmp
+              }
+              if (flag1 && tmp != String.fromCharCode(32)) {
+                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                  if(i == 0 ){
+                    this.result1 = tmp + '0'
+                  }
+                }
               }
             }
             if(parseInt(result)|| parseInt(result) == 0){
-              this.dataList.grossWeight = parseInt(result)*100
+              this.dataList.grossWeight = parseInt(result+this.result1)
             }
           }
           setTimeout(1000)

src/views/warehouse/warehouseManagementTare.vue

@@ -471,6 +471,8 @@ export default {
         type:'干粮',
         addressUrl:'',
         warehouseInOutDetail: {},
+        grossWeight:0,
+        tare:0
       },
       historyList: [],
 
@@ -482,7 +484,8 @@ export default {
       accessoryTFs: false,
       allowEdit: true,
       param: 9600,
-      information:''
+      information:'',
+      result1:'00'
     }
   },
   mounted() {
@@ -539,6 +542,7 @@ export default {
           // var receData = HexConvert.ByteToString(value);
           // console.log("receData",receData);
           var flag = false;
+          var flag1 = false;
           // for (var i = 0; i < value.length; i++) {
           //   var tmp = String.fromCharCode(value[i])
           //   if (tmp == '+') {
@@ -557,7 +561,7 @@ export default {
           //     this.deptBudgetList.tare = parseInt(result)
           //   }
           // }
-          if(this.warehouseName&&this.warehouseName == '山东诸城迈饶库'){
+          if(this.deptBudgetList.warehouseName&&(this.deptBudgetList.warehouseName == '山东诸城迈饶库'||this.deptBudgetList.warehouseName == '克东千红库')){
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
               if (tmp == '+') {
@@ -567,7 +571,7 @@ export default {
               result += tmp
               }
             }
-            if (this.information != '毛重检斤') {
+            if (this.information == '毛重检斤') {
               if(parseInt(result)|| parseInt(result) == 0){
                 this.deptBudgetList.grossWeight = parseInt(result)
               }
@@ -580,29 +584,36 @@ export default {
           else{
             for(var i=0;i<value.length;i++){
               var tmp = String.fromCharCode(value[i])
-              if(value[0] != 49 && value[0] != 2){
-              break
+              
+              if((value[0] != 49 && value[0] != 2)){
+                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                  flag1 = true
+                }
+                else{
+                  break
+                }
               }
               if (tmp == String.fromCharCode(32) ) {
-              flag = true
+                flag = true
               }
-              if (flag && result.length < 7 && tmp != String.fromCharCode(32)) {
-              // if(i-1 >=0 &&tmp == String.fromCharCode(48) && value[i-1] == 32){
-              //   continue
-              // }
-              // if(i-2 >=0 &&tmp == String.fromCharCode(48) && value[i-2] == 32){
-              //   continue
-              // }
-              result += tmp
+              if (flag && result.length < 7 && tmp != String.fromCharCode(32)&&!(value[value.length-1] == 48&&value[value.length-2] == 48)) {
+                result += tmp
+              }
+              if (flag1 && tmp != String.fromCharCode(32)) {
+                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                  if(i == 0 ){
+                    this.result1 = tmp + '0'
+                  }
+                }
               }
             }
-            if (this.information != '毛重检斤') {
-              if(parseInt(result) || parseInt(result) == 0){
-                this.deptBudgetList.grossWeight = parseInt(result)*100
+            if (this.information == '毛重检斤') {
+              if(parseInt(result)|| parseInt(result) == 0){
+              this.deptBudgetList.grossWeight = parseInt(result+this.result1)
               }
             } else {
               if(parseInt(result)|| parseInt(result) == 0){
-                this.deptBudgetList.tare = parseInt(result)*100
+              this.deptBudgetList.tare = parseInt(result+this.result1)
               }
             }
           }

vue.config.js

@@ -141,10 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.107:8090/',
-        // target: 'http://192.168.1.115:8090/',
-        // target: 'http://192.168.1.107/:8090/',
-        // target: 'http://192.168.1.122:9100/',
+        target: 'http://192.168.1.122:9100/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',