更新

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -196,7 +196,6 @@
       },
       printBig() {
         
-          localStorage.setItem('print_pay_data',JSON.stringify(this.printData))
          window.open('../../../../../static/payprint.html?type=2&dataList=' +JSON.stringify(this.printData))
       },
     },

src/views/houseSelfCollect/inspectionManagementrecord.vue

@@ -57,6 +57,9 @@
           <span class="water-line">|</span>
           <span class="water-right">{{scope.row.reWaterContent ? scope.row.reWaterContent : '未复检' }}</span>
         </template>
+      </el-table-column>
+      <el-table-column prop="reMemo" label="复检备注" width="120">
+       
       </el-table-column>
       <el-table-column prop="type" label="类型"></el-table-column>
       <el-table-column :key='Math.random()' v-if='serviceManagementType==1' prop="cost" label="成本（元/吨）"></el-table-column>

src/views/houseSelfCollect/settlement.vue

@@ -385,6 +385,7 @@
         window.open('../../../../../static/payprint.html?type=1&dataList=' + JSON.stringify(this.printData))
       },
       printBig() {
+        localStorage.setItem('print_pay_data',JSON.stringify(this.printData))
         window.open('../../../../../static/payprint.html?type=2&dataList=' + JSON.stringify(this.printData))
       },
       getList() {

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -19,7 +19,7 @@
         </div>
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <ws-form-item label="标题" span="1" prop="title">
-            <el-input v-model="dataList.title" maxlength="16" class="typeselect" placeholder="标题须包含企业简称，不超过16个字" />
+            <el-input v-model="dataList.title" maxlength="20" class="typeselect" placeholder="标题须包含企业简称，不超过20个字" />
             <span class="unchangeable">*</span>
           </ws-form-item>
           <ws-form-item label="货名" span="1" prop="goodsName">
@@ -534,7 +534,7 @@
           })
           return
         }
-        if (this.dataList.title.length > 16) {
+        if (this.dataList.title.length > 20) {
           this.$message({
             message: '标题输入错误！',
             type: 'warning'
@@ -1084,7 +1084,7 @@
 
   .container {
     overflow: scroll;
-    height: 93vh;
+    height: 89vh;
   }
 
   /deep/.basicInformation .el-form-item .el-form-item__content {

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -21,7 +21,7 @@
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 标题 -->
           <ws-form-item label="标题" span="1" prop="title">
-            <el-input v-model="dataList.title" maxlength="16" class="typeselect" placeholder="标题须包含企业简称，不超过16个字" />
+            <el-input v-model="dataList.title" maxlength="20" class="typeselect" placeholder="标题须包含企业简称，不超过20个字" />
           </ws-form-item>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1" prop="goodsName">
@@ -424,16 +424,16 @@
         this.dataList.outputPrivate = CodeToText[value[0]]
         // this.dataList.outputCity = CodeToText[value[1]]
       },
-      submit() {
-        if (this.outputYear) {
-          this.startDate = this.dateFormat('YYYY-mm-dd', this.outputYear[0])
-          this.endDate = this.dateFormat('YYYY-mm-dd', this.outputYear[1])
-        } else {
-          this.startDate = ''
-          this.endDate = ''
-        }
-        // this.getList()
-      },
+      // submit() {
+      //   if (this.outputYear) {
+      //     this.startDate = this.dateFormat('YYYY-mm-dd', this.outputYear[0])
+      //     this.endDate = this.dateFormat('YYYY-mm-dd', this.outputYear[1])
+      //   } else {
+      //     this.startDate = ''
+      //     this.endDate = ''
+      //   }
+      //   // this.getList()
+      // },
       //关闭
       close() {
         this.$router.push({
@@ -517,7 +517,7 @@
           })
           return
         }
-        if (this.dataList.title.length > 16) {
+        if (this.dataList.title.length > 20) {
           this.$message({
             message: '标题输入错误！',
             type: 'warning'
@@ -1070,7 +1070,7 @@
 
   .container {
     overflow: scroll;
-    height: 93vh;
+    height: 89vh;
   }
 
   /deep/.basicInformation .el-form-item .el-form-item__content {

src/views/salesManagement/salesPlanAdd.vue

@@ -21,7 +21,7 @@
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 标题 -->
           <el-form-item label="标题" span="1" prop="title">
-            <el-input v-model="dataList.title" maxlength="16" class="typeselect" placeholder="标题须包含企业简称，不超过16个字" />
+            <el-input v-model="dataList.title" maxlength="20" class="typeselect" placeholder="标题须包含企业简称，不超过20个字" />
             <span class="unchangeable">*</span>
           </el-form-item>
           <!-- 货名 -->
@@ -536,7 +536,7 @@
           })
           return
         }
-        if (this.dataList.title.length > 16) {
+        if (this.dataList.title.length > 20) {
           this.$message({
             message: '标题输入错误！',
             type: 'warning',
@@ -1123,7 +1123,7 @@
 
   .container {
     overflow: scroll;
-    height: 93vh;
+    height: 89vh;
   }
 
   /deep/.basicInformation .el-form-item .el-form-item__content {

src/views/salesManagement/salesPlanEdit.vue

@@ -21,7 +21,7 @@
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 标题 -->
           <ws-form-item label="标题" span="1" prop="title">
-            <el-input v-model="dataList.title" maxlength="16" class="typeselect" placeholder="标题须包含企业简称，不超过16个字" />
+            <el-input v-model="dataList.title" maxlength="20" class="typeselect" placeholder="标题须包含企业简称，不超过20个字" />
           </ws-form-item>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1" prop="goodsName">
@@ -32,7 +32,7 @@
           </ws-form-item>
           <!-- 计划销售量（吨） -->
           <ws-form-item label="计划销售量（吨）" span="1" prop="plannedSaleVolume">
-            <el-input v-model="dataList.plannedSaleVolume" class="typeselect" placeholder="请输入计划采购量" />
+            <el-input v-model="dataList.plannedSaleVolume" class="typeselect" placeholder="请输入计划销售量" />
           </ws-form-item>
           <!-- 最小成交量 -->
           <ws-form-item label="最小成交量（吨）" span="1" prop="minimumVolume">
@@ -426,16 +426,16 @@
         this.dataList.outputPrivate = CodeToText[value[0]]
         // this.dataList.outputCity = CodeToText[value[1]]
       },
-      submit() {
-        if (this.outputYear) {
-          this.startDate = this.dateFormat('YYYY-mm-dd', this.outputYear[0])
-          this.endDate = this.dateFormat('YYYY-mm-dd', this.outputYear[1])
-        } else {
-          this.startDate = ''
-          this.endDate = ''
-        }
-        // this.getList()
-      },
+      // submit() {
+      //   if (this.outputYear) {
+      //     this.startDate = this.dateFormat('YYYY-mm-dd', this.outputYear[0])
+      //     this.endDate = this.dateFormat('YYYY-mm-dd', this.outputYear[1])
+      //   } else {
+      //     this.startDate = ''
+      //     this.endDate = ''
+      //   }
+      //   // this.getList()
+      // },
       //关闭
       close() {
         this.$router.push({
@@ -517,7 +517,7 @@
           })
           return
         }
-        if (this.dataList.title.length > 16) {
+        if (this.dataList.title.length > 20) {
           this.$message({
             message: '标题输入错误！',
             type: 'warning',
@@ -1096,7 +1096,7 @@
 
   .container {
     overflow: scroll;
-    height: 93vh;
+    height: 89vh;
   }
 
   /deep/.basicInformation .el-form-item .el-form-item__content {