Selaa lähdekoodia

Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

Andy 3 vuotta sitten
vanhempi
commit
47e10a7d59

+ 11 - 1
src/routerMap/index.js

@@ -757,7 +757,8 @@ const routerMap = [{
         path: '/cms/BidSystem/ProductDeOrder/list',
         name: 'BidSystemProductDeOrder', // 报价系统→生产拆单
         meta: {
-            index: 3
+            index: 3,
+            keepAlive:true
         },
         component: (resolve) =>
             require(['@/views/BidSystem/ProductDeOrder/list'], resolve),
@@ -1343,6 +1344,15 @@ const routerMap = [{
             require(['@/views/BasicSettings/urgentSetting'], resolve),
     },
     {
+        path: '/cms/BasicSettings/Setting',
+        name: 'Setting', //设置
+        meta: {
+            index: 3
+        },
+        component: (resolve) =>
+            require(['@/views/BasicSettings/Setting'], resolve),
+    },
+    {
         path: '/cms/BasicSettings/CustomerFiles/CustomerClassify',
         name: 'CustomerClassify', //客户分类
         meta: {

+ 225 - 0
src/views/BasicSettings/Setting.vue

@@ -0,0 +1,225 @@
+<template>
+     <div style="padding: 10px" class="setting" dis-hover>
+        <Card title="Options" icon="ios-options" :padding="0"  >
+            <CellGroup>
+                <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+            </CellGroup>
+        </Card>
+      <Card title="Options" icon="ios-options" :padding="0"   >
+            <CellGroup>
+                <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+            </CellGroup>
+        </Card>
+         <Card title="Options" icon="ios-options" :padding="0"  >
+            <CellGroup>
+                <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+            </CellGroup>
+        </Card>
+         <Card title="Options" icon="ios-options" :padding="0"  >
+            <CellGroup>
+                <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+            </CellGroup>
+        </Card>
+         <Card title="Options" icon="ios-options" :padding="0"  >
+            <CellGroup>
+                <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+            </CellGroup>
+        </Card>
+         <Card title="Options" icon="ios-options" :padding="0"  >
+            <CellGroup>
+                <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+            </CellGroup>
+        </Card>
+         <Card title="Options" icon="ios-options" :padding="0"  >
+            <CellGroup>
+                <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+            </CellGroup>
+        </Card>
+         <Card title="Options" icon="ios-options" :padding="0"   >
+            <CellGroup>
+                <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+            </CellGroup>
+        </Card>
+         <Card title="Options" icon="ios-options" :padding="0"   >
+            <CellGroup>
+                <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+            </CellGroup>
+        </Card>
+         <Card title="Options" icon="ios-options" :padding="0"   >
+            <CellGroup>
+                <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+            </CellGroup>
+        </Card>
+         <Card title="Options" icon="ios-options" :padding="0"   >
+            <CellGroup>
+                <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+            </CellGroup>
+        </Card>
+         <Card title="Options" icon="ios-options" :padding="0"   >
+            <CellGroup>
+                <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+            </CellGroup>
+        </Card>
+         <Card title="Options" icon="ios-options" :padding="0"   >
+            <CellGroup>
+                <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+            </CellGroup>
+        </Card>
+         <Card title="Options" icon="ios-options" :padding="0"   >
+            <CellGroup>
+                <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+            </CellGroup>
+        </Card>
+         <Card title="Options" icon="ios-options" :padding="0" >
+            <CellGroup>
+                <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+                 <Cell title="With Switch">
+                    <i-switch v-model="switchValue" slot="extra" />
+                </Cell>
+            </CellGroup>
+        </Card>
+
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return {
+                switchValue: true,
+                switch1:true
+            }
+    }
+       
+        }
+</script>
+<style scoped lang='scss'>
+.setting{
+   margin-top:10px ;
+   display: flex;
+   flex-wrap: wrap;
+}
+/deep/ .ivu-card{
+         background:  #f8f8f9;
+         width: 250px;
+         height: 200px;
+         margin: 10px;
+         border-radius: 20px;
+  .ivu-card:hover{
+      box-shadow: darkgrey 2px 2px 2px 2px ;//边框阴影
+  }
+}
+ /deep/ .ivu-card-head{
+    border-bottom: none;
+}
+</style>

+ 1 - 0
src/views/BidSystem/ContractList/edit.vue

@@ -41,6 +41,7 @@
           @click="showSupModal = true"
           type="primary"
           style="margin-right: 10px"
+          v-show="false"
           >项目辅料</Button
         >
         <Button

+ 109 - 52
src/views/BidSystem/ProductDeOrder/infoDetail.vue

@@ -448,6 +448,20 @@
                 <template slot="setSlot" slot-scope="{ row }">
                   <a @click="handleGoPage(row)">详情</a>
                 </template>
+           <template slot="urlSet" slot-scope="{ index }">
+              <div
+                class="items"
+                v-show="totalData[index].url.length !== 0 ? true : false"
+              >
+                <img
+                  @click="looks(totalData[index].url)"
+                  v-for="(el, idx) in totalData[index].url"
+                  :key="idx"
+                  :src="$store.state.ip + el"
+                  alt=""
+                />
+              </div>
+        </template>
               </Table>
               <Page
                 :page-size-opts="[10, 20, 30, 40, 100, 1000]"
@@ -466,6 +480,20 @@
                 <template slot="setSlot" slot-scope="{ row }">
                   <a @click="handleGoPage(row)">详情</a>
                 </template>
+                 <template slot="urlSet" slot-scope="{ index }">
+              <div
+                class="items"
+                v-show="detailData[index].url.length !== 0 ? true : false"
+              >
+                <img
+                  @click="looks(detailData[index].url)"
+                  v-for="(el, idx) in detailData[index].url"
+                  :key="idx"
+                  :src="$store.state.ip + el"
+                  alt=""
+                />
+              </div>
+        </template>
               </Table>
               <Page
                 :page-size-opts="[10, 20, 30, 40, 100, 1000]"
@@ -541,7 +569,7 @@ export default {
         { title: "材质", align: "center", key: "material", minWidth: 200 },
         { title: "颜色", align: "center", key: "color", minWidth: 200 },
         { title: "工艺", align: "center", key: "work", minWidth: 200 },
-        { title: "图纸", align: "center", key: "url", minWidth: 200 },
+        { title: "图纸", align: "center", key: "url", minWidth: 200 ,slot:"urlSet"},
         {
           title: "左右式",
           align: "center",
@@ -618,7 +646,7 @@ export default {
         { title: "材质", align: "center", key: "material", minWidth: 200 },
         { title: "颜色", align: "center", key: "color", minWidth: 200 },
         { title: "工艺", align: "center", key: "work", minWidth: 200 },
-        { title: "图纸", align: "center", key: "url", minWidth: 200 },
+        { title: "图纸", align: "center", key: "url", minWidth: 200 ,slot:"urlSet"},
         {
           title: "左右式",
           align: "center",
@@ -714,7 +742,6 @@ export default {
       page_index: 1,
       page_size: 10,
       save_state: false,
-      uploadData: {},
       currency_tag: 0,
       clientDetailList: [],
       clientDetailList_respon: [],
@@ -722,6 +749,11 @@ export default {
       clientDetailList_address: [],
     };
   },
+  computed:{
+      uploadData(){
+        return {order_no:this.saveData.order_no||this.$route.query.order_no}
+      }
+  },
   created() {
     if (this.$route.query.type == 3) {
       this.axios
@@ -729,7 +761,7 @@ export default {
           params: { order_no: this.$route.query.order_no },
         })
         .then((res) => {
-          this.formData = res.msg;
+          this.formData = res.data;
         });
       this.getData();
     } else {
@@ -747,6 +779,18 @@ export default {
     }
   },
   methods: {
+     looks(arr) {
+      // const array = [{ img_url: img }];
+      const array = arr.map((v) => {
+        return { img_url: v };
+      });
+      this.$previewImg({
+        list: array,
+        baseUrl: this.$store.state.ip,
+        baseImgField: "img_url",
+        baseTitleField: "",
+      });
+    },
     handleBeforeUpload(){
 
     },
@@ -921,24 +965,25 @@ export default {
           })
           .then((res) => {
               console.log(res.msg.house_type,this.house_type)
-            this.totalData = res.msg.data;
-            this.total = res.msg.total;
-            this.area_code = res.msg.area_code;
-            this.area_title = res.msg.area_title;
-            this.color = res.msg.color;
-            this.fashion = res.msg.fashion;
-            this.house = res.msg.house;
-            this.house_type = res.msg.house_type;
-            this.layer = res.msg.layer;
-            this.material = res.msg.material;
-            this.number = res.msg.number;
-            this.position = res.msg.position;
-            this.product_title = res.msg.product_title;
-            this.product_type = res.msg.product_type;
-            this.state = res.msg.state;
-            this.unit = res.msg.unit;
-            this.url_number = res.msg.url_number;
-            this.work = res.msg.work;
+            
+            this.totalData = res.data.data;
+            this.total = res.data.total;
+            this.area_code = res.data.area_code;
+            this.area_title = res.data.area_title;
+            this.color = res.data.color ;
+            this.fashion = res.data.fashion;
+            this.house = res.data.house;
+            this.house_type = res.data.house_type ;
+            this.layer = res.data.layer;
+            this.material = res.data.material;
+            this.number = res.data.number;
+            this.position = res.data.position;
+            this.product_title = res.data.product_title;
+            this.product_type = res.data.product_type;
+            this.state = res.data.state;
+            this.unit = res.data.unit;
+            this.url_number = res.data.url_number;
+            this.work = res.data.work ;
             this.copy_form = this.searchData;
           });
       }
@@ -955,36 +1000,36 @@ export default {
       } else {
         this.$Message.warning(res.msg || "导入失败");
       }
-      this.page_index = 1;
-        this.page_size = 10;
-        this.axios
-          .post("/api/order_area_details", {
-            ...this.$route.query,
-            ...{ page_index: this.page_index, page_size: this.page_size },
-            order_no:this.saveData.order_no
-          })
-          .then((res) => {
-              console.log(res)
-            this.totalData = res.msg.data;
-            this.total = res.msg.total;
-            this.area_code = res.msg.area_code;
-            this.area_title = res.msg.area_title;
-            this.color = res.msg.color;
-            this.fashion = res.msg.fashion;
-            this.house = res.msg.house;
-            this.house_type = res.msg.house_type;
-            this.layer = res.msg.layer;
-            this.material = res.msg.material;
-            this.number = res.msg.number;
-            this.position = res.msg.position;
-            this.product_title = res.msg.product_title;
-            this.product_type = res.msg.product_type;
-            this.state = res.msg.state;
-            this.unit = res.msg.unit;
-            this.url_number = res.msg.url_number;
-            this.work = res.msg.work;
-            this.copy_form = this.searchData;
-          });
+      // this.page_index = 1;
+      //   this.page_size = 10;
+      //   this.axios
+      //     .post("/api/order_area_details", {
+      //       ...this.$route.query,
+      //       ...{ page_index: this.page_index, page_size: this.page_size },
+      //       order_no:this.saveData.order_no
+      //     })
+      //     .then((res) => {
+      //         console.log(res)
+      //       this.totalData = res.msg.data;
+      //       this.total = res.msg.total;
+      //       this.area_code = res.msg.area_code;
+      //       this.area_title = res.msg.area_title;
+      //       this.color = res.msg.color;
+      //       this.fashion = res.msg.fashion;
+      //       this.house = res.msg.house;
+      //       this.house_type = res.msg.house_type;
+      //       this.layer = res.msg.layer;
+      //       this.material = res.msg.material;
+      //       this.number = res.msg.number;
+      //       this.position = res.msg.position;
+      //       this.product_title = res.msg.product_title;
+      //       this.product_type = res.msg.product_type;
+      //       this.state = res.msg.state;
+      //       this.unit = res.msg.unit;
+      //       this.url_number = res.msg.url_number;
+      //       this.work = res.msg.work;
+      //       this.copy_form = this.searchData;
+      //     });
     },
     save() {
         if(!this.saveData.order_no&&!this.saveData.residential_name&&!this.saveData.abbreviation&&!this.saveData.custom_title&&!this.saveData.warning_state){
@@ -1037,4 +1082,16 @@ export default {
     display: flex;
     justify-content: space-around;
 }
+ .items {
+    width: auto;
+    height: 40px;
+    margin-bottom: 10px;
+  overflow: hidden;
+    border-radius: 5px;
+    position: relative;
+    img {
+      max-width: 40px;
+      max-height: 40px;
+    }
+  }
 </style>