ccjgmwz 3 лет назад
Родитель
Сommit
58910e5580
1 измененных файлов с 16 добавлено и 15 удалено
  1. 16 15
      src/views/houseSelfCollect/inspectionManagementNew.vue

+ 16 - 15
src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -74,7 +74,7 @@
                   </el-select>
                   </el-select>
                 </ws-form-item>
                 </ws-form-item>
                  <ws-form-item  label="类型" span="1" prop="type">
                  <ws-form-item  label="类型" span="1" prop="type">
-                  <ws-select v-model="deptBudgetList.type" disabled>
+                  <ws-select v-model="deptBudgetList.type" >
                     <ws-option v-for="item in typeList" :key="'leixin'+item" :label="item" :value="item" />
                     <ws-option v-for="item in typeList" :key="'leixin'+item" :label="item" :value="item" />
                   </ws-select>
                   </ws-select>
                 </ws-form-item>
                 </ws-form-item>
@@ -157,12 +157,12 @@
                   <ws-input v-model="deptBudgetList.contractNo" placeholder="自动获取,不可编辑" maxlength="100" disabled size="small" />
                   <ws-input v-model="deptBudgetList.contractNo" placeholder="自动获取,不可编辑" maxlength="100" disabled size="small" />
                 </ws-form-item>
                 </ws-form-item>
                 <ws-form-item v-if='serviceManagementType==1' label="成本(元/吨)" span="1" prop="cost">
                 <ws-form-item v-if='serviceManagementType==1' label="成本(元/吨)" span="1" prop="cost">
-                  <ws-input v-model="deptBudgetList.cost" placeholder="自动获取,不可编辑" maxlength="100" :disabled="disabledcost" size="small" />
+                  <ws-input v-model="deptBudgetList.cost" placeholder="自动获取,不可编辑" maxlength="100" size="small" />
                   <img width="17" height="18" style="
                   <img width="17" height="18" style="
                       vertical-align: text-top;
                       vertical-align: text-top;
                       position: relative;
                       position: relative;
                       top: -1px;
                       top: -1px;
-                    " src="../../../public/img/edit.png" @click="editClick(2)" alt="" />
+                    " src="../../../public/img/edit.png" @click="editClick(1)" alt="" />
                 </ws-form-item>
                 </ws-form-item>
                 <ws-form-item v-if='serviceManagementType==1' label="提示" span="1" prop="tips">
                 <ws-form-item v-if='serviceManagementType==1' label="提示" span="1" prop="tips">
                   <ws-input v-model="deptBudgetList.tips" placeholder="自动获取,不可编辑" maxlength="100" disabled size="small" />
                   <ws-input v-model="deptBudgetList.tips" placeholder="自动获取,不可编辑" maxlength="100" disabled size="small" />
@@ -179,7 +179,7 @@
                 </ws-form-item>
                 </ws-form-item>
                 
                 
                 <ws-form-item v-if='statusTypetext=="初检"&&serviceManagementType==1' label="运费(元/吨)" span="1" prop="freight">
                 <ws-form-item v-if='statusTypetext=="初检"&&serviceManagementType==1' label="运费(元/吨)" span="1" prop="freight">
-                  <ws-input :disabled="disabledfright" v-model="deptBudgetList.freight" placeholder="请输入运费" size="small" type="number" @mousewheel.native.prevent />
+                  <ws-input  v-model="deptBudgetList.freight" placeholder="请输入运费" size="small" type="number" @mousewheel.native.prevent />
                   <img width="17" height="18" style="
                   <img width="17" height="18" style="
                       vertical-align: text-top;
                       vertical-align: text-top;
                       position: relative;
                       position: relative;
@@ -444,7 +444,7 @@
           grossWeight: 0,
           grossWeight: 0,
           tare: 0,
           tare: 0,
           grade:'',
           grade:'',
-          inOutDate: '',
+          inOutDate: new Date(),
           netWeight:0,
           netWeight:0,
           pureWeight:0,
           pureWeight:0,
           deductionWeight:0,
           deductionWeight:0,
@@ -597,11 +597,11 @@
           this.goodsdisabled=false
           this.goodsdisabled=false
         }
         }
       },
       },
-       printSmall() {
-        window.open('../../../static/inspectionnew.html?type=1&dataList=' + JSON.stringify(this.deptBudgetList))
+      printSmall() {
+        window.open('../../../static/inspection.html?type=1&dataList=' + JSON.stringify(this.deptBudgetList))
       },
       },
       printBig() {
       printBig() {
-        window.open('../../../static/inspectionnew.html?type=2&dataList=' + JSON.stringify(this.deptBudgetList))
+        window.open('../../../static/inspection.html?type=2&dataList=' + JSON.stringify(this.deptBudgetList))
       },
       },
       record(){
       record(){
         this.$router.push({path: 'inspectionManagementrecord' })
         this.$router.push({path: 'inspectionManagementrecord' })
@@ -826,7 +826,7 @@
                     grossWeight: 0,
                     grossWeight: 0,
                     tare: 0,
                     tare: 0,
                     grade:'',
                     grade:'',
-                    inOutDate: '',
+                    inOutDate: new Date(),
                     netWeight:0,
                     netWeight:0,
                     pureWeight:0,
                     pureWeight:0,
                     deductionWeight:0,
                     deductionWeight:0,
@@ -912,7 +912,7 @@
                 grossWeight: 0,
                 grossWeight: 0,
                 tare: 0,
                 tare: 0,
                 grade:'',
                 grade:'',
-                inOutDate: '',
+                inOutDate: new Date(),
                 netWeight:0,
                 netWeight:0,
                 pureWeight:0,
                 pureWeight:0,
                 deductionWeight:0,
                 deductionWeight:0,
@@ -1081,7 +1081,7 @@
           grossWeight: 0,
           grossWeight: 0,
           tare: 0,
           tare: 0,
           grade:'',
           grade:'',
-          inOutDate: '',
+          inOutDate: new Date(),
           netWeight:0,
           netWeight:0,
           pureWeight:0,
           pureWeight:0,
           deductionWeight:0,
           deductionWeight:0,
@@ -1183,7 +1183,7 @@
                         grossWeight: 0,
                         grossWeight: 0,
                         tare: 0,
                         tare: 0,
                         grade:'',
                         grade:'',
-                        inOutDate: '',
+                        inOutDate: new Date(),
                         netWeight:0,
                         netWeight:0,
                         pureWeight:0,
                         pureWeight:0,
                         deductionWeight:0,
                         deductionWeight:0,
@@ -1319,6 +1319,7 @@
             })
             })
             return
             return
           }
           }
+          this.deptBudgetList.dryGrainPrice = parseFloat(this.deptBudgetList.cost/1000).toFixed(3)
           if (
           if (
             this.deptBudgetList.cost < 0 ||
             this.deptBudgetList.cost < 0 ||
             this.deptBudgetList.cost > 20000 ||
             this.deptBudgetList.cost > 20000 ||
@@ -1976,7 +1977,7 @@
                           grossWeight: 0,
                           grossWeight: 0,
                           tare: 0,
                           tare: 0,
                           grade:'',
                           grade:'',
-                          inOutDate: '',
+                          inOutDate: new Date(),
                           netWeight:0,
                           netWeight:0,
                           pureWeight:0,
                           pureWeight:0,
                           deductionWeight:0,
                           deductionWeight:0,
@@ -2048,7 +2049,7 @@
                         grossWeight: 0,
                         grossWeight: 0,
                         tare: 0,
                         tare: 0,
                         grade:'',
                         grade:'',
-                        inOutDate: '',
+                        inOutDate: new Date(),
                         netWeight:0,
                         netWeight:0,
                         pureWeight:0,
                         pureWeight:0,
                         deductionWeight:0,
                         deductionWeight:0,
@@ -2372,7 +2373,7 @@
           grossWeight: 0,
           grossWeight: 0,
           tare: 0,
           tare: 0,
           grade:'',
           grade:'',
-          inOutDate: '',
+          inOutDate: new Date(),
           netWeight:0,
           netWeight:0,
           pureWeight:0,
           pureWeight:0,
           deductionWeight:0,
           deductionWeight:0,