Merge branch 'hw' of 121.41.102.225:Nidong/jiufang

package.json

@@ -21,6 +21,7 @@
         "node-sass": "^4.14.1",
         "sass-loader": "^9.0.3",
         "swiper": "5.x",
+        "umy-ui": "^1.1.6",
         "v-charts": "^1.19.0",
         "v-viewer": "^1.5.1",
         "vant": "^2.12.33",

src/main.js

@@ -2,7 +2,8 @@ import Vue from "vue";
 import App from "./App.vue";
 import router from "./route/index";
 import store from "./store/index";
-
+import { UTable, UTableColumn } from 'umy-ui';
+import 'umy-ui/lib/theme-chalk/index.css';// 引入样式
 import axios from "./axios/index";
 import ViewUI from "view-design";
 import "view-design/dist/styles/iview.css";
@@ -24,7 +25,8 @@ import "element-ui/lib/theme-chalk/index.css";
 import Print from "@/plugs/print";
 import "lib-flexible";
 import { NumberKeyboard } from "vant";
-
+Vue.component(UTable.name, UTable);
+Vue.component(UTableColumn.name, UTableColumn);
 Vue.use(NumberKeyboard);
 Vue.use(ElementUI);
 Vue.use(Print);

src/views/OrderMannage/BusinessOrderlist/confirmNew.vue

@@ -4809,13 +4809,14 @@ export default {
            
             let arr = JSON.parse(JSON.stringify(this.tableData[rowIndex-1].part.filter(x=>(x.title.indexOf('线条')!=-1))));
 // this.tableData[rowIndex-1].part.filter(x=>(x.title.indexOf('线条')!=-1))
+ console.log(123213123)
             arr.forEach(s=>{
                 res.data.part.forEach((b,bIndex)=>{
                   if(b.part_title.indexOf('线条')!=-1){
-                    
+                   
                      if(b.change.filter(v=>(s.part_id==v.part_id)).length!=0){
                                
-                                 b.change_id = b.change.find(c=>(c.part_id==s.part_id)).id;
+                                 b.change_id = b.change.find(c=>(c.part_id==s.part_id)).id||100;
                                  b.part_title = b.change.find(c=>(c.part_id==s.part_id)).part_title;
                                  b.part_id = b.change.find(c=>(c.part_id==s.part_id)).part_id;
                                  

src/views/ProductValue/detail.vue

@@ -31,7 +31,80 @@
                 <Button type="primary" @click="initData(searchData)">搜索</Button>
             </FormItem>
         </Form>
-           <Table :data='tableData' :columns='SetTableColumns' border max-height='550'></Table>
+           <!-- <Table :data='tableData' :columns='SetTableColumns' border max-height='550'></Table> -->
+        <u-table
+    :data="tableData"
+    :max-height='height'
+    border
+    v-loading='loading'
+    :show-overflow-tooltip='true'
+          use-virtual
+          showBodyOverflow="title"
+          showHeaderOverflow="title"
+          :row-height="rowHeight"
+    >
+    <u-table-column
+      prop="url_number"
+      label="图号"
+      align='center'
+      minWidth="100">
+    </u-table-column>
+      <u-table-column
+        prop="layer"
+        label="区域"
+        align='center'
+        minWidth="100">
+      </u-table-column>
+    
+        <u-table-column
+          prop="title"
+          label="产品名称"
+          align='center'
+          minWidth="100">
+        </u-table-column>
+        <u-table-column
+          prop="num"
+          label="数量"
+          align='center'
+          minWidth="100">
+        </u-table-column>
+        <u-table-column
+          prop="price"
+          label="单价"
+          align='center'
+          minWidth="100">
+        </u-table-column>
+        <u-table-column
+          prop="total_price"
+          label="金额"
+          align='center'
+         minWidth="100"
+         >
+
+        </u-table-column>
+      <u-table-column
+          prop="technology"
+          label="工艺"
+          align='center'
+         minWidth="100">
+        </u-table-column>
+        <u-table-column
+          :label="item.title"
+          align='center'
+          v-for="item in setColumns"
+          :key="item.key"
+         >
+           <u-table-column 
+           v-show="item.children" v-for="_item in item.children" :key="_item.id"
+           :label='_item.title'
+           :prop='_item.key'
+           align='center'
+           minWidth='100'
+           >
+
+           </u-table-column>
+        </u-table-column>
+  </u-table>
            </div>
     </div>
 </template>
@@ -39,6 +112,9 @@
 export default {
     data(){
         return{
+            loading:false,
+            height:0,
+            rowHeight:55,
             urlList:[],
            productList:[],
             formData:{},
@@ -96,11 +172,14 @@ export default {
            this.formData = this.$route.query
     },
     mounted(){
+        this.height = 500
      this.initData();
     },
     methods:{
         initData(row){
+            this.loading = true;
                this.axios.post('/api/output_value_statement',{order_no:this.$route.query.order_no,...row}).then(res=>{
+                   this.loading = false;
                    this.urlList = res.data.url_number_list;
                    this.productList = res.data.product_list;
                             res.data.head.forEach(ele => {
@@ -144,7 +223,9 @@ export default {
                         }
                     })
                     this.tableData = res.data.list;
-                    console.log(this.tableData);
+                    this.tableData.forEach(v=>{
+                        v.total_price = (v.num*1*v.price).toFixed(2);
+                    })
                })
         },
         back(){

src/views/ProductionOrderList/ProductCheck/list.vue

@@ -15,7 +15,7 @@
                         </Select>
                     </FormItem>
                     <FormItem :label-width='40'>
-                        <Button type="primary" @click="initData(searchData)">搜索</Button>
+                        <Button type="primary" @click="search">搜索</Button>
                     </FormItem>
                </Form>
                <Table :data='tableData' :columns='tableColumns' max-height='550' border>
@@ -73,6 +73,10 @@ export default {
        this.initData();
     },
     methods:{
+        search(){
+            this.pageIndex = 1;
+            this.initData(this.searchData);
+        },
         goPage(row){
          this.$router.push({path:'/cms/productionorderlist/ProductCheck/detail',query:{order_no:row.order_no}});
         },

src/views/brand/list.vue

@@ -71,7 +71,7 @@ export default {
   data () {
     return {
       list: [
-        { title: '品牌名称', name: 'Input', value: '', serverName: 'title', placeholder: '请输入品牌名称',size:'normal' },
+        { title: '品牌名称', name: 'Input', value: '', serverName: 'title', placeholder: '请输入品牌名称',size:'default' },
       ],
       tableColums: [
         { title: '序号', type: 'index', align: 'center', key: 'id', width: '100' },
@@ -127,7 +127,7 @@ export default {
       this.getData(this.proxyObj)
     },
     addItems (obj,type) {
-      
+      this.classInfo.title='';
       //type 1新增 2编辑
       if (type==2) {
         this.showType = 2

vue.config.js

@@ -1,6 +1,6 @@
 const axios_default_ip =
   process.env.NODE_ENV == "dev"
-    ? "http://121.41.102.225:82"
+    ? "http://121.37.173.82:82"
     : process.env.NODE_ENV == "test-prd"
     ? "http://121.41.102.225:82" //
     : process.env.NODE_ENV == "prd_other"