lizhuo merges

src/views/business/spd/goal_management/experiment/DemoChildren.vue

@@ -0,0 +1,27 @@
+<template>
+<div>
+  <span>{{user}}</span>
+  <span><el-button type="info" @change="sendMessageToFather">change</el-button></span>
+</div>
+</template>
+
+<script>
+export default {
+  name: "DemoChildren",
+  props: ['user'],
+  data () {
+    return {
+
+    }
+  },
+  methods: {
+    sendMessageToFather() {
+      this.$emit('sendMessageToFather', 'uyasjhfasb')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/business/spd/goal_management/experiment/DemoFather.vue

@@ -0,0 +1,48 @@
+<template>
+  <div>
+    <div>
+      <el-table :data="myUser">
+        <el-table-column label="name" prop="name"></el-table-column>
+        <el-table-column label="age" prop="age"></el-table-column>
+        <el-table-column>
+          <template scope="scope">
+            <el-button type="primary">主要按钮</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <DemoChildren :user="myUser" @sendMessageToFather="handlerTitle"></DemoChildren>
+  </div>
+</template>
+
+<script>
+import DemoChildren from "./DemoChildren"
+export default {
+  name: "DemoFather",
+  components: {
+    DemoChildren
+  },
+  data () {
+    return {
+      myUser: [
+        {id: null, name: 'lz', age: 12},
+        {id: 1, name: 'lz', age: 12},
+        {id: 2, name: 'lz', age: 12},
+        {id: 3, name: 'lz', age: 12},
+        {id: null, name: 'lz', age: 12}
+      ]
+    }
+  },
+  methods: {
+    handlerTitle(title) {
+      for (const element of this.myUser) {
+        element.name = title
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/material/changeApply/add/column.js

@@ -46,7 +46,7 @@ export default function useColumns(){
     //     is: "el-input",
     //     disabled:true,
     //   },
-      
+
     // },
     {
       item:{
@@ -58,7 +58,7 @@ export default function useColumns(){
         valueFormat: "yyyy-MM-dd HH:mm:ss",
         disabled:true,
       },
-  
+
     },
     {
       item:{
@@ -69,7 +69,7 @@ export default function useColumns(){
         is: "el-input",
         disabled:true,
       },
-  
+
     },
     {
       item:{
@@ -81,7 +81,7 @@ export default function useColumns(){
         valueFormat: "yyyy-MM-dd HH:mm:ss",
         disabled:true,
       },
-  
+
     },
     {
       item:{
@@ -92,7 +92,7 @@ export default function useColumns(){
         is: "el-input",
         disabled:true,
       },
-  
+
     },
     {
       item:{
@@ -104,14 +104,14 @@ export default function useColumns(){
         valueFormat: "yyyy-MM-dd HH:mm:ss",
         disabled:true,
       },
-  
+
     },
-    
+
   ].map(({ item, attr }) => ({
     attr,
     item: { ...item, hidden: true, span: item.span || 6 },
   }));
-  
+
   const TabColumns = [
     {
       item:{
@@ -154,7 +154,7 @@ export default function useColumns(){
               threeClass:'threeClass',
               fourClass:'fourClass',
               drug:'isDrugNumber',
-              registrationNo:'oriRegistrationNo',
+              registrationNo:'registrationNo',
               dosageFrom:'dosageFrom',
               dosageFromName:'dosageFromName',
               maintenanceType:'curingType',
@@ -162,9 +162,9 @@ export default function useColumns(){
               leadTime:'deliveryPeriod',
             },
 
-            
+
           },
-         
+
         },
         {
           item:{
@@ -176,7 +176,7 @@ export default function useColumns(){
             is: "el-input",
             // disabled:true,
           },
-         
+
         },
         {
           item:{
@@ -187,7 +187,7 @@ export default function useColumns(){
             is: "el-select",
             dictName: "sys_number_yes_no", // 字典名
           },
-         
+
         },
         {
           item:{
@@ -197,7 +197,7 @@ export default function useColumns(){
           attr:{
             is: "el-input",
           },
-          
+
         },
         {
           item:{
@@ -208,7 +208,7 @@ export default function useColumns(){
           attr:{
             is: "el-input",
           },
-         
+
         },
         {
           item:{
@@ -218,7 +218,7 @@ export default function useColumns(){
           attr:{
             is: "el-input",
           },
-         
+
         },
         {
           item:{
@@ -234,7 +234,7 @@ export default function useColumns(){
               factory:'id'
             }
           },
-          
+
         },
         {
           item:{
@@ -245,7 +245,7 @@ export default function useColumns(){
           attr:{
             is: "el-input",
           },
-         
+
         },
         {
           item:{
@@ -257,7 +257,7 @@ export default function useColumns(){
             is: "el-select",
             dictName: "sys_storage_condition", // 字典名
           },
-          
+
         },
         {
           item:{
@@ -268,7 +268,7 @@ export default function useColumns(){
             is: "el-select",
             dictName: "sys_conditions_carriage", // 字典名
           },
-         
+
         },
         {
           item:{
@@ -280,7 +280,7 @@ export default function useColumns(){
             controlsPosition:"right",
             min:0
           },
-         
+
         },
         // {
         //   item:{
@@ -290,7 +290,7 @@ export default function useColumns(){
         //   attr:{
         //     is: "el-input",
         //   },
-         
+
         // },
         // {
         //   item:{
@@ -300,7 +300,7 @@ export default function useColumns(){
         //   attr:{
         //     is: "el-input",
         //   },
-         
+
         // },
         {
           item:{
@@ -311,7 +311,7 @@ export default function useColumns(){
             is: "el-input",
             disabled:true,
           },
-          
+
         },
         {
           item:{
@@ -322,7 +322,7 @@ export default function useColumns(){
             is: "el-input",
             disabled:true,
           },
-         
+
         },
         {
           item:{
@@ -333,7 +333,7 @@ export default function useColumns(){
             is: "el-input",
             disabled:true,
           },
-          
+
         },
         {
           item:{
@@ -344,7 +344,7 @@ export default function useColumns(){
             is: "el-input",
             disabled:true,
           },
-         
+
         },
         {
           item:{
@@ -355,7 +355,7 @@ export default function useColumns(){
             is: "el-select",
             dictName: "sys_medicine", // 字典名
           },
-         
+
         },
         {
           item:{
@@ -365,7 +365,7 @@ export default function useColumns(){
           attr:{
             is: "el-input",
           },
-         
+
         },
         {
           item:{
@@ -376,7 +376,7 @@ export default function useColumns(){
             is: "el-select",
             dictName: "medical_instruments", // 字典名
           },
-          
+
         },
         {
           item:{
@@ -387,7 +387,7 @@ export default function useColumns(){
             is: "el-select",
             dictName: "curing_type", // 字典名
           },
-         
+
         },
         {
           item:{
@@ -402,11 +402,11 @@ export default function useColumns(){
               dosageFrom:'id'
             }
           },
-          
+
         },
-  
+
       ]
-    }, 
+    },
   ]
 
   return {TableColumns,TabColumns}

src/views/material/changeApply/add/index.vue

@@ -78,10 +78,10 @@ export default {
       },
       set(){},
     }
-  
+
   },
   watch: {
-    
+
   },
   methods: {
     setVisible(prop){
@@ -117,7 +117,7 @@ export default {
         if(code == 200){
           this.params = data;
         }
-        
+
       } catch (err) {
         // catch
         console.error(err);
@@ -126,7 +126,7 @@ export default {
         this.loading = false;
       }
     },
-    
+
     //
     async hide() {
       const {
@@ -145,7 +145,7 @@ export default {
     },
     //
     async useRowAdd(prop) {
-      
+
       const { TableColumns } = this.TabColumns.find(
         ({ item: { key } }) => key === prop
       );
@@ -188,7 +188,7 @@ export default {
                 message:'物料信息不能不为空！'
               })
             }
-            
+
           } catch (err) {
             // catch
             console.error(err);
@@ -217,13 +217,13 @@ export default {
               title: msg,
             });
           }
-          
+
         } catch (error) {}
         finally{
           this.loading = false;
         }
 
-        
+
         // await;
       })
     },
@@ -247,8 +247,8 @@ export default {
       @open="beforeOpen"
       v-loading="loading"
     >
-      <div 
-        slot="title" 
+      <div
+        slot="title"
         style="display: flex;
             justify-content: space-between;
             align-items: center;"
@@ -288,8 +288,8 @@ export default {
           </component
         ></template>
       </el-super-form>
-      
-  
+
+
       <el-tabs v-model="tabName" style="padding: 0 20px 20px">
         <el-tab-pane
           v-for="({ item, TableColumns: columns }, index) in TabColumns"
@@ -333,7 +333,7 @@ export default {
                   </el-option>
                 </component>
               </template>
-  
+
               <template slot="registrationNo" slot-scope="scope">
                 <component
                   v-bind="scope.attr"
@@ -344,7 +344,7 @@ export default {
                 >
                 </component>
               </template>
-  
+
               <template slot="medicalDevices" slot-scope="scope">
                 <component
                   v-bind="scope.attr"
@@ -389,8 +389,8 @@ export default {
                 >
                 </component>
               </template>
-              
-  
+
+
               <el-table-column fixed="right" label="操作" width="120" align="center">
                 <template slot="header" slot-scope="scope">
                   <el-button
@@ -420,8 +420,8 @@ export default {
         </el-tab-pane>
       </el-tabs>
 
-      
-     
+
+
     </el-drawer>
 </template>
 

vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://172.16.100.107:8080/drp-admin`, //测试
-       target: `http://test-sy.derom.com/drp-admin`, //测试
+       // target: `http://test-sy.derom.com/drp-admin`, //测试
         // target: `http://release-sy.derom.com/drp-admin`, //预发
         // target: `http://sy.derom.com/drp-admin`, //生产
         // target: `http://172.16.63.202:8000/drp-admin`, // D本地
@@ -46,7 +46,7 @@ module.exports = {
         // target: `http://172.16.13.47:8000/drp-admin`, //这是一个美女的本地
         // target: `http://172.16.13.113:8000/drp-admin`, //DWT本地
         // target: `http://172.16.13.21:8000/drp-admin`, //CKF本地
-        // target: `http://172.16.13.43:8000/drp-admin`, //lz's localhost
+        target: `http://172.16.61.99:8000/drp-admin`, //lz's localhost
         //  target: `http://127.0.0.1:8000/drp-admin`,
         changeOrigin: true,
         pathRewrite: {