Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/inspectInfo.vue

@@ -634,6 +634,9 @@
         }
       },
 
+      // waterContentChange() {
+      //   debugger
+      //   if (this.inspect.goodsName) {
       waterContentChange(type) {
         if (this.inspect.goodsName&&type!='water') {
           for (var i = 0; i < this.purchasePriceList.length; i++) {

src/views/houseSelfCollect/weighingManagement.vue

@@ -71,7 +71,7 @@
       <el-table-column prop="secretaryWeigher" label="司称员">
        <template slot-scope="scope">
          <div v-if="scope.row.secretaryWeigher == scope.row.skinInspector">{{scope.row.skinInspector}}</div>
-         <div v-else>  {{scope.row.secretaryWeigher}}<span v-if="scope.row.skinInspector">,{{scope.row.skinInspector}}</span></div>
+         <div v-else>{{scope.row.secretaryWeigher}}<span v-if="scope.row.skinInspector">,{{scope.row.skinInspector}}</span></div>
        </template> 
       </el-table-column>
       <el-table-column

src/views/houseSelfCollect/weightCheck.vue

@@ -586,8 +586,7 @@
                       } else {
                         //累计售粮没有超上限完成毛检保存
                         this.weighingList.relationId = this.relationId;
-                        (this.weighingList.secretaryWeigher =
-                          sessionStorage.getItem('ws-pf_staffName')),
+                        this.weighingList.secretaryWeigher = sessionStorage.getItem('ws-pf_staffName'),
                         grossWeight(this.weighingList)
                           .toPromise()
                           .then((response) => {

src/views/platformaudit/grainpulseenterprisereview.vue

@@ -468,7 +468,7 @@ export default {
     },
     handlePictureCardPreview(res, file) {
       let url = file.response.url;
-      if(this.companyList1.sitePhotoAddress.length>9){
+      if(this.companyList1.sitePhotoAddress.length>=9){
          this.$message({
           message: '最多上传九张图片！',
           type: 'warning',

src/views/tranManagement/tranManagementFireFeedback.vue

@@ -85,8 +85,8 @@
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
         <!-- 运输方式 -->
-        <ws-form-item label="运输方式" span="1" prop="contractNo">
-          {{ deptBudgetList.contractNo }}
+        <ws-form-item label="运输方式" span="1" prop="tranType">
+          {{ deptBudgetList.tranType }}
         </ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及车次</div>
@@ -263,8 +263,15 @@
           </ws-info-table>
         </div>
       </div>
-      <div style="text-align: center; color: #8890b1; font-size: 16px">
+      <div style="text-align: right; color: #8890b1; font-size: 16px">
         合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
+         <!--阶段状态-->
+         <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">
+          未完货
+        </span>
+        <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">{{
+          deptBudgetList.feedbackStatus
+        }}</span>
       </div>
       <!-- <el-button class="add bg-bottom" type="primary" size="small" @click="add">
         <img width="22" height="22" src="../../../public/img/add.png" alt="" />
@@ -465,6 +472,7 @@ export default {
         })
     },
     submit() {
+      debugger
       for (var i = 0; i < this.freightspace.length; i++) {
         if (this.freightspace[i].temporaryDriverFlag != 0) {
           if (!this.freightspace[i].driver) {
@@ -488,9 +496,24 @@ export default {
             })
             return
           }
+          debugger
           if (!this.freightspace[i].loadNetWeight) {
             this.$message({
-              message: '装载净重不能为空！',
+              message: '装车净重不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+            if (this.freightspace[i].loadNetWeight < 0 || this.freightspace[i].loadNetWeight > 10000) {
+            this.$message({
+              message: '装车净重输入错误！',
+              type: 'warning',
+            })
+            return
+          }
+           if (!this.freightspace[i].loadingDate) {
+            this.$message({
+              message: '装车日期不能为空！',
               type: 'warning',
             })
             return
@@ -623,7 +646,7 @@ export default {
   height: 300px;
 }
 .el-form {
-  padding: 0 15%;
+  padding: 0 10%;
 }
 /deep/.ws-info-table .el-form-item {
   border-right: 1px solid transparent;
@@ -953,7 +976,7 @@ export default {
 }
 //装车详情
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 19%;
+  width: 20%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 50%;
@@ -1035,4 +1058,24 @@ export default {
   margin-top: 11px;
   margin-left: 53px;
 }
+/deep/.el-input--suffix .el-input__inner{
+  padding-right: 0px !important;
+}
+//送达/未送达
+.noservice,
+.service {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+}
+.noservice {
+  background: #c4cada;
+  color: #ffffff;
+}
+.service {
+  background: #e5f1f7;
+  color: #50cad4;
+}
 </style>

src/views/tranManagement/tranManagementFireFeedbackLook.vue

@@ -463,7 +463,7 @@ export default {
   height: 300px;
 }
 .el-form {
-  padding: 0 15%;
+  padding: 0 10%;
 }
 /deep/.ws-info-table .el-form-item {
   border-right: 1px solid transparent;
@@ -857,4 +857,5 @@ export default {
   margin-top: 11px;
   margin-left: 53px;
 }
+
 </style>

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -85,8 +85,8 @@
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
         <!-- 运输方式 -->
-        <ws-form-item label="运输方式" span="1" prop="contractNo">
-          {{ deptBudgetList.contractNo }}
+        <ws-form-item label="运输方式" span="1" prop="tranType">
+          {{ deptBudgetList.tranType }}
         </ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及车次</div>
@@ -193,7 +193,7 @@
               </template>
             </ws-form-item>
             <!--卸车日期-->
-            <el-form-item label="卸车日期:" span="1" prop="unloadingDate">
+            <el-form-item label="卸车日期:" span="1" prop="unloadingDate" style="width:22%">
               <ws-date-picker
                 v-if="item.status == '未装车' || item.status == '已送达'"
                 :disabled="readonly"
@@ -213,13 +213,9 @@
               />
             </el-form-item>
             <!-- 提交 -->
-            <span class="servicedout" v-show="item.status == '已送达'"
-              >已卸车</span
-            >
-            <span class="noserviceout" v-show="item.status == '未装车'">{{
-              item.status
-            }}</span>
-            <span
+            <span class="servicedout" v-show="item.status == '已送达'">已卸车</span>
+            <span class="noserviceout" v-show="item.status == '未装车'">{{item.status}}</span>
+            <!-- <span
               style="text-align: right; padding: 10px"
               class="center"
               v-if="
@@ -229,7 +225,7 @@
                 item.status == '已装车'
               "
             >
-              <div>
+             
                 <el-button
                   class="bg-bottom"
                   type="primary"
@@ -237,9 +233,19 @@
                   @click="submit(deptBudgetList)"
                   >提交</el-button
                 >
-              </div>
-            </span>
-
+            
+            </span> -->
+             <el-button
+              style="text-align: right; padding: 10px;margin:4px 0 0 20px"
+              type="primary"
+                  @click="submit(deptBudgetList)"
+              v-if="
+                item.status == '' ||
+                item.status == null ||
+                item.status == '未送达' ||
+                item.status == '已装车'
+              "
+            > 提交 </el-button>
             <!-- <div
               v-show="
                 item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'
@@ -269,8 +275,15 @@
           </ws-info-table>
         </div>
       </div>
-      <div style="text-align: center; color: #8890b1; font-size: 16px">
+      <div style="text-align: right; color: #8890b1; font-size: 16px">
         合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
+          <!--阶段状态-->
+         <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">
+          未完货
+        </span>
+        <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">{{
+          deptBudgetList.feedbackStatus
+        }}</span>
       </div>
       <!-- <el-button class="add bg-bottom" type="primary" size="small" @click="add">
         <img width="22" height="22" src="../../../public/img/add.png" alt="" />
@@ -631,7 +644,7 @@ export default {
   height: 300px;
 }
 .el-form {
-  padding: 0 15%;
+  padding: 0 10%;
 }
 /deep/.ws-info-table .el-form-item {
   border-right: 1px solid transparent;
@@ -905,6 +918,7 @@ export default {
 }
 .catNos {
   width: 5%;
+  min-width: 60px;
   height: 30px;
   margin-top: 10px;
   margin-left: 20px;
@@ -965,6 +979,7 @@ export default {
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 50%;
+  min-width: 92px;
   background: #f6f7fc;
 }
 /deep/.liaison .flex {
@@ -985,9 +1000,10 @@ export default {
   width: 20%;
 }
 /deep/.lianluoyuan .ws-info-table .el-form-item .el-form-item__label {
-  width: 50%;
+  width: 40%;
+  min-width: 92px;
   background: #f6f7fc;
-  padding-right: 28px;
+  // padding-right: 28px;
   margin-top: 5px;
 }
 /deep/.lianluoyuan .flex {
@@ -1001,6 +1017,7 @@ export default {
 }
 /deep/.lianluoyuan .ws-info-table .el-form-item .el-form-item__content {
   padding: 0px;
+  min-width: 110px;
   margin-top: 5px;
 }
 //卸车状态
@@ -1029,4 +1046,24 @@ export default {
   margin-top: 11px;
   margin-left: 53px;
 }
+/deep/.el-input--suffix .el-input__inner{
+  padding-right: 0;
+}
+//送达/未送达
+.noservice,
+.service {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+}
+.noservice {
+  background: #c4cada;
+  color: #ffffff;
+}
+.service {
+  background: #e5f1f7;
+  color: #50cad4;
+}
 </style>

src/views/tranManagement/tranManagementFireReceivingFeedbackLook.vue

@@ -25,8 +25,7 @@
     <ws-form
       class="position"
       ref="deptBudgetList"
-      :rules="rules"
-      :model="deptBudgetList"
+     :model="deptBudgetList"
     >
       <div class="small-title" style="font-size: 16px">任务详情</div>
       <ws-info-table>
@@ -211,7 +210,7 @@
           </ws-info-table>
         </div>
       </div>
-      <div style="text-align: center; color: #8890b1; font-size: 16px">
+      <div style="text-align: right; color: #8890b1; font-size: 16px">
         合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
         <!--阶段状态-->
         <span
@@ -262,6 +261,7 @@
   </div>
 </template>
 <script>
+import { regionData } from 'element-china-area-data'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {
@@ -336,6 +336,7 @@ export default {
   },
   activated() {
     this.deptBudgetList.id = this.$route.query.id
+    console.log(this.deptBudgetList.id)
     this.getList()
   },
   computed: {
@@ -467,7 +468,7 @@ export default {
   height: 300px;
 }
 .el-form {
-  padding: 0 15%;
+  padding: 0 10%;
 }
 /deep/.ws-info-table .el-form-item {
   border-right: 1px solid transparent;

src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -280,7 +280,7 @@
                 value-format="yyyy-MM-dd"
               />
             </el-form-item>
-            <div style="text-align: right; padding: 10px" class="center1">
+            <div style=" padding: 10px" class="center1">
               <el-button
                 v-show="item.status == '未装车'"
                 class="bg-bottom"
@@ -915,7 +915,7 @@ export default {
   height: 300px;
 }
 .el-form {
-  padding: 0 15%;
+  padding: 0 10%;
 }
 /deep/.ws-info-table .el-form-item {
   border-right: 1px solid transparent;
@@ -1189,10 +1189,10 @@ export default {
 }
 //联络员及车次
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 20%;
+  width: 22%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 50%;
+  width: 37%;
   background: #f6f7fc;
 }
 /deep/.liaison .flex {
@@ -1274,4 +1274,7 @@ export default {
   margin-left: 14%;
   margin-top: -7%;
 }
+/deep/.el-input--suffix .el-input__inner{
+  padding-right: 0px;
+}
 </style>

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -85,8 +85,8 @@
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
         <!-- 运输方式 -->
-        <ws-form-item label="运输方式" span="1" prop="contractNo">
-          {{ deptBudgetList.contractNo }}
+        <ws-form-item label="运输方式" span="1" prop="tranType">
+          {{ deptBudgetList.tranType }}
         </ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px; width: 50%;float: left;">装车详情</div>
@@ -268,12 +268,12 @@
                     alt=""
                   />
                 </el-upload>
-                 <span v-if="deptBudgetList.tranCarInfoList[index].loadPoundImg != null " >1</span>
+                 <!-- <span v-if="deptBudgetList.tranCarInfoList[index].loadPoundImg" >1</span>
                  <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].loadPoundImg == null
+                    !deptBudgetList.tranCarInfoList[index].loadPoundImg 
                   "
-                  >未上传</span>
+                  >未上传</span> -->
               </template>
             </ws-form-item>
               <!--箱号-->
@@ -417,7 +417,6 @@ export default {
           loadNetWeight: '',
           loadPoundImg:''
         },
-        // {loadPoundImg:{}},
           
       ],
       name: '',
@@ -674,7 +673,10 @@ console.log(document.getElementsByClassName("upload-demo"))
         .then((response) => {
           this.deptBudgetList = response
           //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
-          this.freightspace = response.tranCarInfoList
+          if(response.tranCarInfoList.length > 0){
+                this.freightspace = response.tranCarInfoList
+          }
+         
           for (var i = 0; i < this.freightspace.length; i++) {
             if (!this.freightspace[i].loadNetWeight) {
               this.freightspace[i].loadNetWeight = 0
@@ -785,7 +787,7 @@ console.log(document.getElementsByClassName("upload-demo"))
   height: 300px;
 }
 .el-form {
-  padding: 0 15%;
+  padding: 0 10%;
 }
 /deep/.ws-info-table .el-form-item {
   border-right: 1px solid transparent;
@@ -1061,7 +1063,7 @@ console.log(document.getElementsByClassName("upload-demo"))
   width: 20%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 50%;
+  width: 40%;
   background: #f6f7fc;
 }
 /deep/.liaison .flex {
@@ -1148,4 +1150,7 @@ console.log(document.getElementsByClassName("upload-demo"))
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__content{
   padding: 0px;
 }
+/deep/.el-input--suffix .el-input__inner{
+  padding-right: 0px;
+}
 </style>