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

public/static/weightCheckInOut.html

@@ -157,7 +157,7 @@
             <td class="col col-bgc">皮重（吨）</td>
             <td class="col">{{tableData.tare}}</td>
             <td class="col col-bgc">扣重（吨）</td>
-            <td class="col">{{tableData.deductionWeight}}</td>
+            <td class="col">{{tableData.deductionWeight ? tableData.deductionWeight : '0'}}</td>
             <td class="col col-bgc" colspan="2">净重（吨）</td>
             <td class="col">{{tableData.netWeight}}</td>
           </tr>
@@ -225,9 +225,7 @@
           this.smallContent = true
           this.bigContent = false
         }
-        console.log(_data, "sddsd")
         this.tableData = _data
-        console.log(this.tableData)
         document.title = "粮食检斤单"
         window.print()
         window.onafterprint = function(event) {

src/views/contractManagement/purchaseContract.vue

@@ -73,11 +73,27 @@
       </el-table-column>
       <el-table-column width='150' prop="status" label="状态">
         <template slot-scope="scope">
-          <div v-if="scope.row.status != '执行中'">
-            <span v-if="scope.row.approveStatus">{{
+          <div v-if="scope.row.status != '执行中'&&scope.row.status != '发运结束'">
+            <!-- <span v-if="scope.row.approveStatus">{{
               scope.row.approveStatus
-            }}</span>
-            <el-popover v-else placement="left" :width="285" trigger="click" visible-arrow="false"
+            }}</span> -->
+            <el-select v-if="scope.row.approveStatus" v-model="scope.row.approveStatus" placeholder="" class="statusselect"
+            @change='selectstatuschange($event,scope.row)'
+            disabled
+            :value="scope.row.approveStatus">
+            <el-option label="待决策人审核" value="待决策人审核"
+              style="color: #8890b1" />
+          </el-select>
+          <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
+            @change='selectstatuschange($event,scope.row)'
+
+            :value="scope.row.status">
+            <el-option label="待执行" value="待执行"
+              style="color: #8890b1" />
+              <el-option label="执行中" value="执行中"
+              style="color: #8890b1" />
+          </el-select>
+            <!-- <el-popover v-else placement="left" :width="285" trigger="click" visible-arrow="false"
               @show="history(scope.row)">
               <template>
                 <span slot="reference">
@@ -104,7 +120,7 @@
             </el-popover>
             <img v-if="!scope.row.approveStatus" width="17" height="18"
               style="vertical-align: text-top; position: relative; top: -1px;" src="../../../public/img/edit.png"
-              @click="editClick(scope.row)" alt="" />
+              @click="editClick(scope.row)" alt="" /> -->
           </div>
           <div v-else>
             <!-- {{scope.row.status}} -->
@@ -118,9 +134,9 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
-      <el-table-column prop="contractExpenditure" label="合同支出"> </el-table-column>
-      <el-table-column prop="expenses" label="费用支出"> </el-table-column>
+      <el-table-column width='120' prop="signingDate" label="签订日期"> </el-table-column>
+      <el-table-column width='120' prop="contractExpenditure" label="合同支出"> </el-table-column>
+      <el-table-column width='120' prop="expenses" label="费用支出"> </el-table-column>
       
       <el-table-column width='130' prop="mildewGrain" label="已付款（元）">
       </el-table-column>

src/views/contractManagement/salesContract.vue

@@ -75,11 +75,27 @@
       </el-table-column>
       <el-table-column width='150' prop="status" label="状态">
         <template slot-scope="scope">
-          <div v-if="scope.row.status != '执行中'">
-            <span v-if="scope.row.approveStatus">{{
+          <div v-if="scope.row.status != '执行中'&&scope.row.status != '发运结束'">
+            <!-- <span v-if="scope.row.approveStatus">{{
               scope.row.approveStatus
-            }}</span>
-            <el-popover v-else placement="left" :width="285" trigger="click" visible-arrow="false"
+            }}</span> -->
+            <el-select v-if="scope.row.approveStatus" v-model="scope.row.approveStatus" placeholder="" class="statusselect"
+            @change='selectstatuschange($event,scope.row)'
+            disabled
+            :value="scope.row.approveStatus">
+            <el-option label="待决策人审核" value="待决策人审核"
+              style="color: #8890b1" />
+          </el-select>
+          <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
+            @change='selectstatuschange($event,scope.row)'
+
+            :value="scope.row.status">
+            <el-option label="待执行" value="待执行"
+              style="color: #8890b1" />
+              <el-option label="执行中" value="执行中"
+              style="color: #8890b1" />
+          </el-select>
+            <!-- <el-popover v-else placement="left" :width="285" trigger="click" visible-arrow="false"
               @show="history(scope.row)">
               <template>
                 <span slot="reference">
@@ -106,7 +122,7 @@
             </el-popover>
             <img v-if="!scope.row.approveStatus" width="17" height="18"
               style="vertical-align: text-top; position: relative; top: -1px;" src="../../../public/img/edit.png"
-              @click="editClick(scope.row)" alt="" />
+              @click="editClick(scope.row)" alt="" /> -->
           </div>
           <div v-else>
             <!-- {{scope.row.status}} -->
@@ -120,9 +136,9 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
-      <el-table-column prop="contractRevenue" label="合同收入"> </el-table-column>
-      <el-table-column prop="expenses" label="费用支出"> </el-table-column>
+      <el-table-column width='120' prop="signingDate" label="签订日期"> </el-table-column>
+      <el-table-column width='120' prop="contractRevenue" label="合同收入"> </el-table-column>
+      <el-table-column width='120' prop="expenses" label="费用支出"> </el-table-column>
       <el-table-column width='120' prop="mildewGrain" label="未回款（元）">
         <template slot-scope="scope">
         <span style='color:red;' v-if='scope.row.datestatus&&scope.row.invoiced>scope.row.contractRevenue'>{{scope.row.mildewGrain}}</span>

src/views/warehouse/warehouseManagementTare.vue

@@ -323,6 +323,7 @@
     getstaff,
     goodsnameXiala,
     getReceiptTaskNo,
+    getPrintInfo
   } from '@/model/warehouse/index'
   import Pagination from '@/components/Pagination'
   import WsUpload from '@/components/WsUpload'
@@ -1451,6 +1452,8 @@
         }).then(() => {
           this.$refs.deptBudgetList.validate((valid) => {
             if (valid) {
+              console.log( this.deptBudgetList)
+
               this.deptBudgetList.grossWeight /= 1000
               this.deptBudgetList.tare /= 1000
               this.deptBudgetList.netWeight /= 1000
@@ -1470,25 +1473,19 @@
                   }
                   this.$message.success('添加成功')
                   if (status) {
-                    this.weightbills.carNo = this.deptBudgetList.carNo
-                    this.weightbills.boxNo = this.deptBudgetList.boxNo
-                    this.weightbills.boxNoOther = this.deptBudgetList.boxNoOther
-                    this.weightbills.wingNumber = this.deptBudgetList.wingNumber
-                    this.weightbills.wingNumberOther = this.deptBudgetList.wingNumberOther
-                    this.weightbills.shipName = this.deptBudgetList.shipName
-                    this.weightbills.shipNumber = this.deptBudgetList.shipNumber
-                    this.weightbills.type = this.deptBudgetList.type
-                    this.weightbills.grossWeight = this.deptBudgetList.grossWeight
-                    this.weightbills.tare = this.deptBudgetList.tare
-                    this.weightbills.netWeight = this.deptBudgetList.netWeight
-                    this.weightbills.outType = this.deptBudgetList.outType
-                    this.weightbills.backOffice = this.deptBudgetList.outType
-
-                    var date = new Date()
-                    this.weightbills.updateDate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' +
-                      date.getDate() + ' ' + date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds()
-                      localStorage.setItem('ck_bd_printData1',JSON.stringify(this.weightbills))
-                      window.open('../../../../static/weightCheckOut.html?type=2')
+                     getPrintInfo({
+                            id: response,
+                          })
+                          .toPromise()
+                          .then((res) => {
+                            localStorage.setItem('ck_bd_printData',JSON.stringify(res))//出库皮重检斤
+                           window.open('../../../../static/weightCheckInOut.html?type=2')
+                          })
+                    // var date = new Date()
+                    // this.weightbills.updateDate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' +
+                    //   date.getDate() + ' ' + date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds()
+                    //   localStorage.setItem('ck_bd_printData',JSON.stringify(this.deptBudgetList))//出库皮重检斤
+                    //   window.open('../../../../static/weightCheckInOut.html?type=2')
                   }
                   this.$router.push({
                     path: 'warehouseManagementList',