前端孟祥旭

src/lang/zh.js

@@ -519,7 +519,7 @@
     statisticalReport:'统计报表',
     purchaseReceiptStatisticsList:'采购入库报表',
     purchaseClosingCashierList:'采购平仓报表',
-    
+    salesDeliveryReportList:'销售入库报表',
 
     
     //运输管理
@@ -4774,7 +4774,7 @@
   statisticalReport:{
     purchaseReceiptStatisticsList:'采购入库报表',
     purchaseClosingCashierList:'采购平仓报表',
-
+    salesDeliveryReportList:'销售入库报表',
   },
   //运输管理
   tranManagement: {

src/views/statisticalReport/component/routers/route.js

@@ -43,6 +43,22 @@ const statisticalReportRouter = {
           },
       //   hidden: true
       },
+      //销售平仓报表
+      {
+        path: 'salesDeliveryReportList',
+        component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/salesDeliveryReportList'),
+        name: 'salesDeliveryReportList',
+        meta: {
+        title: 'salesDeliveryReportList',
+        shortcutEntrance: 'statisticalReport',
+        module: 'contractManagement.salesContract',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+        },
+    //   hidden: true
+    },
   ],
 
 };

src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -29,17 +29,17 @@
           <ws-button type="primary" @click="handleAdd()">通过</ws-button>
           <ws-button type="primary" @click="handleAdd()">审核</ws-button>
           <ws-button type="primary" @click="dialogFormVisible1=true">付款</ws-button>
-           <el-dialog
-            width="30%"
+          <el-dialog
+            width="25%"
             title="付款"
             :visible.sync="dialogFormVisible1"
             :append-to-body="true"
           >
             <el-form :model="form">
-              <el-form-item label="本次付款金额（元）" :label-width="formLabelWidth">
-                <el-input v-model="form.region" autocomplete="off" class="deal"></el-input>
+              <el-form-item label="未付金额（元）" :label-width="formLabelWidth">
+                <!-- <el-input v-model="form.region" autocomplete="off" class="deal"></el-input> -->
               </el-form-item>
-              <el-form-item label="补充金额" :label-width="formLabelWidth">
+              <el-form-item label="本次收款金额（元）" :label-width="formLabelWidth">
                 <el-input
                   v-model="form.region"
                   autocomplete="off"
@@ -62,15 +62,15 @@
                 />
               </el-form-item>
               <el-form-item label="上传付款截图" :label-width="formLabelWidth">
-              <el-upload
-                action="https://www.zthymaoyi.com/upload/admin"
-                list-type="picture-card"
-                :on-preview="handlePictureCardPreview"
-                :on-remove="handleRemove"
-                class="photo2"
-              >
-                <i class="el-icon-plus"></i>
-              </el-upload>
+                <el-upload
+                  action="https://www.zthymaoyi.com/upload/admin"
+                  list-type="picture-card"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  class="photo2"
+                >
+                  <i class="el-icon-plus"></i>
+                </el-upload>
               </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -78,22 +78,23 @@
               <el-button type="primary" @click="dialogFormVisible1= false">确 定</el-button>
             </div>
           </el-dialog>
-           <ws-button type="primary" @click="dialogFormVisible2=true">收款</ws-button>
-                <el-dialog
-            width="30%"
+          <!-- 收款 -->
+          <ws-button type="primary" @click="dialogFormVisible2=true">收款</ws-button>
+          <el-dialog
+            width="25%"
             title="收款"
             :visible.sync="dialogFormVisible2"
             :append-to-body="true"
           >
             <el-form :model="form">
-              <el-form-item label="本次收款金额（元）" :label-width="formLabelWidth">
+              <el-form-item label="未收金额（元）" :label-width="formLabelWidth">
                 <el-input v-model="form.region" autocomplete="off" class="deal"></el-input>
               </el-form-item>
-              <el-form-item label="补充金额" :label-width="formLabelWidth">
+              <el-form-item label="本次收款金额（元）" :label-width="formLabelWidth">
                 <el-input
                   v-model="form.region"
                   autocomplete="off"
-                  placeholder="请输入补充金额"
+                  placeholder="请输入本次收款金额"
                   class="deal"
                 ></el-input>
               </el-form-item>
@@ -112,39 +113,22 @@
                 />
               </el-form-item>
               <el-form-item label="上传收款截图" :label-width="formLabelWidth">
-              <el-upload
-                action="https://www.zthymaoyi.com/upload/admin"
-                list-type="picture-card"
-                :on-preview="handlePictureCardPreview"
-                :on-remove="handleRemove"
-                class="photo2"
-              >
-                <i class="el-icon-plus"></i>
-              </el-upload>
+                <el-upload
+                  action="https://www.zthymaoyi.com/upload/admin"
+                  list-type="picture-card"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  class="photo2"
+                >
+                  <i class="el-icon-plus"></i>
+                </el-upload>
               </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
               <el-button @click="dialogFormVisible2 = false">取 消</el-button>
-              <el-button type="primary" @click="dialogFormVisible2= false">确 定</el-button>
+              <el-button type="primary" @click="dialogFormVisible2= false">提 交</el-button>
             </div>
           </el-dialog>
-          <template slot="right">
-            <span style="width: 70px; display: inline-block; color: #8890b1">状态：</span>
-            <ws-select
-              v-model="searchTypeText"
-              class="typeselect"
-              @change="selecttaskType"
-              :value="searchType"
-            >
-              <ws-option
-                v-for="item in taskTypeList"
-                :key="item.value"
-                :label="item.value"
-                :value="item.value"
-                style="color: #8890b1"
-              />
-            </ws-select>
-          </template>
           <ws-select
             v-model="searchKeyWord"
             placeholder="可按照合同编号和任务编号进行查找"
@@ -162,8 +146,7 @@
           height="780"
           @selection-change="handleSelectionChange"
         >
-        
-         <el-table-column type="selection" width="55"></el-table-column>
+          <el-table-column type="selection" width="55"></el-table-column>
           <el-table-column type="index" label="序号" width="50"></el-table-column>
           <el-table-column class="table_td" prop="contractNo" label="合同编号"></el-table-column>
           <el-table-column class="table_td" prop="procurementPlan" label="平仓日期"></el-table-column>
@@ -181,8 +164,7 @@
           <el-table-column class="table_td" prop="closedPosition" label="收款日期"></el-table-column>
           <el-table-column class="table_td" label="客户"></el-table-column>
           <el-table-column class="table_td" label="库点"></el-table-column>
-          <el-table-column prop="status" label="状态">
-          </el-table-column>
+          <el-table-column prop="status" label="状态"></el-table-column>
         </el-table>
 
         <!-- 页数 -->
@@ -276,13 +258,7 @@ export default {
       enter: {
         closePositionList: []
       },
-      // taskTypeList:[
-      //   {value:'待审核',type:1},
-      //   {value:'已完成',type:2},
-      //   {value:'已通过',type:3},
-      //   {value:'已成交',type:4},
-      // ],
-
+      
       // 提交类型
       submitType: true,
       size: 10,
@@ -324,7 +300,7 @@ export default {
         type: 'warning'
       }).then(() => {
         console.log(23456678790)
-        
+
         chengList(this.warehouseList)
           .toPromise()
           .then(response => {
@@ -363,8 +339,8 @@ export default {
     //     })
     // },
     handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
+      this.multipleSelection = val
+    },
     handleRemove(file) {
       console.log(file)
     },
@@ -795,7 +771,7 @@ export default {
   padding: 0 10%;
 }
 .photo2 {
-  padding: 0 17%;
+  padding: 0 12%;
 }
 /deep/.el-form-item--small .el-form-item__label,
 .el-form-item--small .el-form-item__content {
@@ -808,6 +784,11 @@ hr {
   width: 66%;
   margin-left: 9%;
 }
+.el-date-editor.el-input,
+.el-date-editor.el-input__inner,
+.el-input-number--small {
+  width: 123% !important;
+}
 // .danjia{
 //   width: 9px;
 //   height: 9px;

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -25,8 +25,102 @@
           <ws-button type="primary" @click="handleAdd()">待结算</ws-button>
           <ws-button type="primary" @click="handleAdd()">已结算</ws-button>
           <ws-button type="primary" @click="handleAdd()">全部</ws-button>
-            <ws-button type="primary" @click="handleAdd()">通过</ws-button>
+          <ws-button type="primary" @click="handleAdd()">通过</ws-button>
           <ws-button type="primary" @click="handleAdd()">驳回</ws-button>
+          <ws-button type="primary" @click="dialogFormVisible1=true">付款</ws-button>
+          <el-dialog
+            width="25%"
+            title="付款"
+            :visible.sync="dialogFormVisible1"
+            :append-to-body="true"
+          >
+            <el-form :model="form">
+              <el-form-item label="未付金额（元）" :label-width="formLabelWidth">
+                <!-- <el-input v-model="form.region" autocomplete="off" class="deal"></el-input> -->
+              </el-form-item>
+              <el-form-item label="补充金额" :label-width="formLabelWidth">
+                <el-input
+                  v-model="form.region"
+                  autocomplete="off"
+                  placeholder="请输入补充金额"
+                  class="deal"
+                ></el-input>
+              </el-form-item>
+              <el-form-item
+                label="付款日期"
+                prop="submissionDate"
+                :label-width="formLabelWidth"
+                class="deal"
+              >
+                <ws-date-picker
+                  v-model="deptBudgetList.submissionDate"
+                  type="date"
+                  placeholder="请选择付款日期"
+                  value-format="yyyy-MM-dd"
+                  class="deal"
+                />
+              </el-form-item>
+              <el-form-item label="上传付款截图" :label-width="formLabelWidth">
+                <el-upload
+                  action="https://www.zthymaoyi.com/upload/admin"
+                  list-type="picture-card"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  class="photo2"
+                >
+                  <i class="el-icon-plus"></i>
+                </el-upload>
+              </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+              <el-button @click="dialogFormVisible1 = false">取 消</el-button>
+              <el-button type="primary" @click="dialogFormVisible1= false">提 交</el-button>
+            </div>
+          </el-dialog>
+          <!-- 开发票 -->
+          <ws-button type="primary" @click="dialogFormVisible2=true">开发票</ws-button>
+          <el-dialog
+            width="30%"
+            title="批量开发票"
+            :visible.sync="dialogFormVisible2"
+            :append-to-body="true"
+          >
+            <el-form :model="form">
+              <el-form-item label="发票类型" :label-width="formLabelWidth">
+                <el-select v-model="form.name" autocomplete="off" class="deal"></el-select>
+              </el-form-item>
+              <el-form-item label="发票金额（元）" :label-width="formLabelWidth">
+                <el-input v-model="form.region" autocomplete="off" class="deal"></el-input>
+              </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+              <el-button @click="dialogFormVisible2 = false">取 消</el-button>
+              <el-button type="primary" @click="dialogFormVisible2 = false">提 交</el-button>
+            </div>
+          </el-dialog>
+          <!-- 开发票 -->
+          <el-dialog
+            width="30%"
+            title="开发票"
+            :visible.sync="dialogFormVisible2"
+            :append-to-body="true"
+          >
+            <el-form :model="form">
+              <el-form-item label="发票类型" :label-width="formLabelWidth">
+                <el-select v-model="form.name" autocomplete="off" class="deal"></el-select>
+              </el-form-item>
+              <el-form-item label="可开发票金额（元）" :label-width="formLabelWidth">
+                <!-- <el-input v-model="form.region" autocomplete="off" class="deal"></el-input> -->
+              </el-form-item>
+              <el-form-item label="实际发票金额（元）" :label-width="formLabelWidth">
+                <el-input v-model="form.region" autocomplete="off" class="deal"></el-input>
+              </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+              <el-button @click="dialogFormVisible2 = false">取 消</el-button>
+              <el-button type="primary" @click="dialogFormVisible2 = false">提 交</el-button>
+            </div>
+          </el-dialog>
           <ws-button type="primary" @click="dialogFormVisible5=true">修改</ws-button>
           <el-dialog
             width="30%"
@@ -53,7 +147,7 @@
             </el-form>
             <div slot="footer" class="dialog-footer">
               <el-button @click="dialogFormVisible5 = false">取 消</el-button>
-              <el-button type="primary" @click="dialogFormVisible5 = false">确认</el-button>
+              <el-button type="primary" @click="dialogFormVisible5 = false">提 交</el-button>
             </div>
           </el-dialog>
           <ws-button type="primary" @click="dialogFormVisible11 = true">补货结转</ws-button>
@@ -79,23 +173,6 @@
             </div>
           </el-dialog>
           <ws-button type="primary" @click="handleAdd()">审核</ws-button>
-          <template slot="right">
-            <span style="width: 70px; display: inline-block; color: #8890b1">状态：</span>
-            <ws-select
-              v-model="searchTypeText"
-              class="typeselect"
-              @change="selecttaskType"
-              :value="searchType"
-            >
-              <ws-option
-                v-for="item in taskTypeList"
-                :key="item.value"
-                :label="item.value"
-                :value="item.value"
-                style="color: #8890b1"
-              />
-            </ws-select>
-          </template>
           <ws-select
             v-model="searchKeyWord"
             placeholder="可按照合同编号和任务编号进行查找"
@@ -116,7 +193,7 @@
           style="width: 100%; margin-top: 20px"
           height="780"
         >
-           <el-table-column type="selection" width="55"></el-table-column>
+          <el-table-column type="selection" width="55"></el-table-column>
           <el-table-column type="index" label="序号" width="50"></el-table-column>
           <el-table-column class="table_td" prop="contractNo" label="合同编号"></el-table-column>
           <el-table-column class="table_td" prop="procurementPlan" label="货名"></el-table-column>
@@ -142,8 +219,7 @@
           <el-table-column class="table_td" label="库点"></el-table-column>
           <el-table-column class="table_td" label="发票类型"></el-table-column>
           <el-table-column class="table_td" label="已开发票(元)"></el-table-column>
-          <el-table-column prop="status" label="状态">
-          </el-table-column>
+          <el-table-column prop="status" label="状态"></el-table-column>
         </el-table>
 
         <!-- 页数 -->
@@ -197,7 +273,7 @@ export default {
       dialogFormVisible6: false,
       dialogFormVisible7: false,
       dialogFormVisible8: false,
-      dialogFormVisible11 :false,
+      dialogFormVisible11: false,
       dialogVisible: false,
 
       form: {
@@ -328,8 +404,8 @@ export default {
         })
     },
     handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
+      this.multipleSelection = val
+    },
     handleRemove(file) {
       console.log(file)
     },
@@ -749,9 +825,9 @@ export default {
 .el-scrollbar__wrap {
   overflow-y: hidden;
 }
-.deal {
-  margin-left: 9%;
-  width: 66%;
+/deep/.deal {
+  margin-left: 0%;
+  width: 64%;
 }
 .photo {
   padding: 0% 34%;
@@ -760,7 +836,7 @@ export default {
   padding: 0 10%;
 }
 .photo2 {
-  padding: 0 55%;
+  padding: 0 12%;
 }
 /deep/.el-form-item--small .el-form-item__label,
 .el-form-item--small .el-form-item__content {
@@ -773,6 +849,11 @@ hr {
   width: 66%;
   margin-left: 9%;
 }
+.el-date-editor.el-input,
+.el-date-editor.el-input__inner,
+.el-input-number--small {
+  width: 123% !important;
+}
 // .danjia{
 //   width: 9px;
 //   height: 9px;

vue.config.js

@@ -145,7 +145,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.120:8090/',
+        target: 'http://192.168.1.116:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',