hw

src/routerMap/index.js

@@ -2224,33 +2224,24 @@ const routerMap = [
     component: (resolve) =>
       require(["@/views/Agreement/productMessage/detail"], resolve),
   },
-  // {
-  //   path: "/cms/Agreement/match/list",
-  //   name: "MatchList", //合同-->匹配-->匹配列表
-  //   meta: {
-  //     index: 3,
-  //   },
-  //   component: (resolve) =>
-  //     require(["@/views/Agreement/match/list"], resolve),
-  // },
-  // {
-  //   path: "/cms/Agreement/match/matching",
-  //   name: "Matching", //合同-->匹配-->匹配操作
-  //   meta: {
-  //     index: 3,
-  //   },
-  //   component: (resolve) =>
-  //     require(["@/views/Agreement/match/matching"], resolve),
-  // },
-  // {
-  //   path: "/cms/Agreement/match/check",
-  //   name: "MatchCheck", //合同-->匹配-->查看
-  //   meta: {
-  //     index: 3,
-  //   },
-  //   component: (resolve) =>
-  //     require(["@/views/Agreement/match/check"], resolve),
-  // },
+  {
+    path: "/cms/ProductValue/list",
+    name: "productValueList", //产值表
+    meta: {
+      index: 3,
+    },
+    component: (resolve) =>
+      require(["@/views/ProductValue/list"], resolve),
+  },
+  {
+    path: "/cms/ProductValue/detail",
+    name: "productMessageDetail", //产值表-->详情
+    meta: {
+      index: 3,
+    },
+    component: (resolve) =>
+      require(["@/views/ProductValue/detail"], resolve),
+  },
   // 测试用
   {
     path: "/cms/ordermannage/businessorderlist/editcopy",

src/views/ProductValue/detail.vue

@@ -0,0 +1,107 @@
+<template>
+    <div>
+           <Toptitle title='产值表详情'>
+               <Button type="primary">导出</Button>
+               <Button type="primary" style="margin-left:10px" @click="back">返回</Button>
+           </Toptitle>
+                 <Form class="form_content" :label-width='100' style="border-bottom:1px solid #eeeeee">
+            <FormItem label='项目编码：'>
+               <span class="form_item">{{formData.order_no}}</span>
+            </FormItem>
+            <FormItem label='项目名称：'>
+                <span class="form_item">{{formData.project_title}}</span>
+            </FormItem>
+            <FormItem label='项目简称：'>
+               <span class="form_item">{{formData.abbreviation}}</span>
+            </FormItem>
+        </Form>
+        <Form class="form_content" :label-width='100'>
+              <FormItem label='图号：'>
+                 <Select clearable v-model="searchData.url_number" filterable class="form_item">
+                    <Option />
+                </Select>
+            </FormItem>
+            <FormItem label='产品：'>
+                 <Select clearable v-model="searchData.url_number" filterable class="form_item">
+                    <Option/>
+                </Select>
+            </FormItem>
+            <FormItem>
+                <Button type="primary">搜索</Button>
+            </FormItem>
+        </Form>
+           <Table :data='tableData' :columns='SetTableColumns' border max-height='550'></Table>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            formData:{},
+            searchData:{
+                url_number:''
+            },
+            tableData:[
+                // {url_number:'1',region:1,product_title:'1',num:'1',price:'1',total_price:'1',technology:'1',south_1:'1',south_2:'1',south_3:'1',south_4:'1',north_1:'1',north_2:'1',north_3:'1',north_4:'1',east_1:'1',east_2:'1',east_3:'1',east_4:'1'},
+                //  {url_number:'1',region:1,product_title:'1',num:'1',price:'1',total_price:'1',technology:'1',south_1:'1',south_2:'1',south_3:'1',south_4:'1',north_1:'1',north_2:'1',north_3:'1',north_4:'1',east_1:'1',east_2:'1',east_3:'1',east_4:'1'},
+                //   {url_number:'1',region:1,product_title:'1',num:'1',price:'1',total_price:'1',technology:'1',south_1:'1',south_2:'1',south_3:'1',south_4:'1',north_1:'1',north_2:'1',north_3:'1',north_4:'1',east_1:'1',east_2:'1',east_3:'1',east_4:'1'}
+            ],
+           tableColumns:[
+               {title:'图号',align:'center',minWidth:100,key:'url_number'},
+               {title:'区域',align:'center',minWidth:100,key:'region'},
+               {title:'产品名称',align:'center',minWidth:100,key:'product_title'},
+               {title:'数量',align:'center',minWidth:100,key:'num'},
+               {title:'单价',align:'center',minWidth:100,key:'price'},
+               {title:'金额',align:'center',minWidth:100,key:'total_price'},
+               {title:'工艺',align:'center',minWidth:100,key:'technology'},
+           ],
+           setColumns:[
+            //    {title:'木工',align:'center',children:[
+            //        {title:'南线一组',align:'center',key:'south_1',minWidth:100},
+            //        {title:'南线二组',align:'center',key:'south_2',minWidth:100},
+            //        {title:'南线三组',align:'center',key:'south_3',minWidth:100},
+            //        {title:'南线四组',align:'center',key:'south_4',minWidth:100},
+            //    ]},
+            //     {title:'油漆',align:'center',children:[
+            //        {title:'北线一组',align:'center',key:'north_1',minWidth:100},
+            //        {title:'北线二组',align:'center',key:'north_2',minWidth:100},
+            //        {title:'北线三组',align:'center',key:'north_3',minWidth:100},
+            //        {title:'北线四组',align:'center',key:'north_4',minWidth:100},
+            //    ]},
+            //     {title:'包装',align:'center',children:[
+            //        {title:'东线一组',align:'center',key:'east_1',minWidth:100},
+            //        {title:'东线二组',align:'center',key:'east_2',minWidth:100},
+            //        {title:'东线三组',align:'center',key:'east_3',minWidth:100},
+            //        {title:'东线四组',align:'center',key:'east_4',minWidth:100},
+            //    ]},
+           ]
+        }
+
+    },
+    computed:{
+        SetTableColumns(){
+
+            return this.tableColumns.concat(this.setColumns)
+        }
+    },
+    created(){
+           this.formData = this.$route.query
+    },
+    methods:{
+        back(){
+            this.$router.go(-1)
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.form_content{
+    display: flex;
+    flex-wrap:wrap;
+    margin-top: 15px;
+}
+.form_item{
+    width: 200px;
+    display: inline-block;
+}
+</style>

src/views/ProductValue/list.vue

@@ -0,0 +1,122 @@
+<template>
+    <div>
+        <Toptitle title="产值表"></Toptitle>
+        <div class="content">
+        <Form :label-width='120' class="form_content">
+      <FormItem label='查询区间：'>
+          <DatePicker type="date" placeholder="年/月/日" class="form_item" v-model="searchData.start_time"></DatePicker>
+          ~
+          <DatePicker type="date" placeholder="年/月/日" class="form_item" v-model="searchData.end_time"></DatePicker>
+      </FormItem>
+            <FormItem label='项目编码：'>
+                <Select clearable v-model="searchData.order_no" filterable class="form_item">
+                    <Option/>
+                </Select>
+            </FormItem>
+            <FormItem label='项目名称：'>
+                 <Select clearable v-model="searchData.project_title" filterable class="form_item">
+                    <Option/>
+                </Select>
+            </FormItem>
+            <FormItem label='项目简称：'>
+                 <Select clearable v-model="searchData.abbreviation" filterable class="form_item">
+                    <Option/>
+                </Select>
+            </FormItem>
+            <FormItem :label-width='40'>
+                <Button type="primary" @click="initData(searchData)">搜索</Button>
+            </FormItem>
+        </Form>
+        <Table :data='tableData' :columns='tableColumns' border max-height='550'>
+            <template slot="set" slot-scope="{row}">
+           
+                <a @click="handleSet(row)">详情</a>
+       
+            </template>
+        </Table>
+        </div>
+          <div class="content_body_page">
+        <Page
+          :page-size-opts="[10, 20, 30, 40, 100]"
+          @on-page-size-change="changeSize"
+          @on-change="changePage"
+          :current="pageIndex"
+          show-total
+          show-elevator
+          :total="total"
+          show-sizer
+          :page-size="pageSize"
+        />
+          </div>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            pageIndex:1,
+            pageSize:10,
+            total:0,
+            tableData:[],
+            tableColumns:[
+                {title:'项目编号',align:'center',minWidth:120,key:'order_no'},
+                {title:'项目名称',align:'center',minWidth:120,key:'project_title'},
+                {title:'项目简称',align:'center',minWidth:120,key:'abbreviation'},
+                {title:'在线小计',align:'center',minWidth:120,key:'online_price'},
+                {title:'完成小计',align:'center',minWidth:120,key:'finish_price'},
+                {title:'备注',align:'center',minWidth:120,key:'remark'},
+                {title:'操作',align:'center',minWidth:120,key:'set',slot:'set'}
+            ],
+               searchData:{
+                  start_time:'', //查询开始时间
+                  end_time:'', //查询结束时间
+                   order_no:'', //项目编码
+                   project_title:'', //项目名称
+                   abbreviation:'',//项目简称
+               }
+        }
+    },
+    mounted(){
+           this.initData();
+    },
+    methods:{
+        initData(row){
+
+         this.axios.post('/api/contract_deep_list',{...row,page_size:this.pageSize,page_index:this.pageIndex}).then(res=>{
+             this.tableData = res.data.data;
+             this.total = res.data.total;
+         })
+        },
+        changePage(e){
+          this.pageIndex = e;
+          this.initData(this.searchData);
+        },
+        changeSize(e){
+            this.pageIndex = 1;
+            this.pageSize = e;
+            this.initData(this.searchData);
+        },
+        handleSet(row){
+                    this.$router.push({path:'/cms/ProductValue/detail',query:{...row}})
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.content{
+    height:85%;
+    overflow: auto;
+}
+.form_content{
+    margin-top: 15px;
+    display: flex;
+    flex-wrap: wrap;
+}
+.content_body_page{
+    text-align: center;
+    margin-top:10px;
+}
+.form_item{
+    width: 200px;
+}
+</style>

src/views/PurchasingManage/InstockOrder/edit.vue

@@ -315,9 +315,9 @@
             >{{ row.title }}</span
           >
         </template>
-        <template slot="total_cost" slot-scope="{ row }">
+        <!-- <template slot="total_cost" slot-scope="{ row }">
           <span v-show="row.no_tax_total_price*1+row.transport_price*1>0">{{(row.no_tax_total_price*1+row.transport_price*1).toFixed(2)}}</span>
-        </template>
+        </template> -->
         <!-- :disabled="row.state==0" -->
         <!-- :disabled="row.state==0" -->
         <template slot="setSlot" slot-scope="{ row, index }">
@@ -1442,7 +1442,7 @@ export default {
           key: "total_cost",
           align: "center",
           minWidth: 120,
-          slot: "total_cost",
+          // slot: "total_cost",
         },
         {
           title: "参照订单号/到货单号",
@@ -2112,6 +2112,9 @@ export default {
         data: { order_in_no: [order_in_no], merge_state: 0 },
       })
         .then((res) => {
+          res.data.list.data.forEach(v=>{
+            v.total_cost = (v.no_tax_total_price*1+v.transport_price*1).toFixed(2);
+          })
           this.tableData = res.data.list.data;
           this.otherPriceList =
             res.data.price_list.length != 0

src/views/PurchasingManage/extraCosts/list.vue

@@ -268,7 +268,7 @@ export default {
                 obj.check_end_time = obj.check_end_time?Date.parse(obj.check_end_time).toString().slice(0,10):'';
             }
             this.loading = true;
-          this.axios.post('/api/cost_list',{...obj}).then(res=>{
+          this.axios.post('/api/cost_list',{...obj,page_size:this.page_size,page_index:this.page_index}).then(res=>{
               this.tableData = res.data.data;
               this.total = res.data.total;
               this.loading = false;

src/views/SealApprove/list.vue

@@ -15,7 +15,7 @@
        <div class="content">
        <Form class="form_content" :label-width='120'>
            <FormItem label='单据编号：'>
-               <Input class="form_item" placeholder="请搜素" v-model="searchData.seal_no" clearable/>
+               <Input class="form_item" placeholder="请搜索" v-model="searchData.seal_no" clearable/>
            </FormItem>
            <FormItem label='用印单位：'>
                <Input class="form_item" placeholder="请搜索" v-model="searchData.project_title" clearable/>

src/views/leadMatch/weightMemo/HXYedit.vue

@@ -768,7 +768,7 @@ this.is_edit = true;
         }
       }
       if(this.$route.query.cut_order_id||this.cut_order_id){
-      await  this.axios.get('/api/cut_order_detail',{params:{cut_order_id:this.$route.query.cut_order_id?this.$route.query.cut_order_id:this.cut_order_id,order_type:1}}).then(res=>{
+      await  this.axios.post('/api/cut_order_details',{cut_order_id:this.$route.query.cut_order_id?this.$route.query.cut_order_id:this.cut_order_id,order_type:1}).then(res=>{
 
              this.formData.project_number = res.data.project_number;
              this.formData.product_name = res.data.project_name;

vue.config.js

@@ -1,8 +1,8 @@
 const axios_default_ip =
   process.env.NODE_ENV == "dev"
-    ? "http://124.71.176.88:882"
+    ? "http://121.41.102.225:82"
     : process.env.NODE_ENV == "test-prd"
-    ? "http://121.41.102.225:82" //测试服
+    ? "http://hxy_api.qingyaokeji.com" //测试服
     : process.env.NODE_ENV == "prd_other"
     ? "http://121.37.173.82:82" //贝斯特
     : "http://124.71.176.88:882";