物料添加单位

pages/materiel/classification/add.vue

@@ -30,7 +30,7 @@
         </Col>
         <Col :span="24">
           <h4>扩展属性</h4>
-          <Table border :columns="columns" :data="checkList" height="300">
+          <Table border :columns="columns" :data="checkList" height="450">
             <template slot-scope="{ row, index }" slot="title">
               <div v-if="row.fieldType==1||row.fieldType==2">{{row.title}}</div>
               <Input
@@ -61,20 +61,21 @@
                 :key="row.dataType"
               ></Dictionary>
             </template>
-            <template slot-scope="{ row, index }" slot="dataType">
-              <!-- <state
+            <template slot-scope="{ row, index }" slot="unitName">
+              <state
                 v-if="row.fieldType==1"
-                code="materail.main.company"
-                :value="row.company"
+                code="material.main.unitName"
+                :value="row.unitName"
                 type="text"
-              ></state> -->
+              ></state>
               <Dictionary
+                v-else
                 @on-change="setRow(row,index)"
-                v-model="row.company"
-                code="materail.main.company"
+                v-model="row.unitName"
+                code="material.main.unitName"
                 type="select"
-                :value="row.company"
-                :key="row.company"
+                :value="row.unitName"
+                :key="row.unitName"
               ></Dictionary>
             </template>
             <template slot-scope="{ row, index }" slot="required">
@@ -145,9 +146,9 @@ export default {
         },
         {
           title: "单位",
-          key: "company",
+          key: "unitName",
           align: "center",
-          slot: "company"
+          slot: "unitName"
         },
         {
           title: "是否必填",

pages/materiel/classification/edit.vue

@@ -33,7 +33,7 @@
         </Col>
         <Col :span="24" style="padding:20px 0 0px 10px;margin-bottom:10px;" class="table-solt">
           <!--fieldType 1.固有，2.默认，3自定义； -->
-          <Table border :columns="columns" :data="checkList" class="tableCommon" height="300">
+          <Table border :columns="columns" :data="checkList" class="tableCommon" height="450">
             <template slot-scope="{ row, index }" slot="title">
               <div v-if="row.fieldType==1||row.fieldType==2">{{row.title}}</div>
               <Input v-else v-model="row.title" placeholder="请输入" @on-blur="setRow(row,index)" />
@@ -59,9 +59,23 @@
                 :key="row.dataType"
               ></Dictionary>
             </template>
-            <!-- <template slot-scope="{ row, index }" slot="result">
-              <Input v-model="row.result" placeholder="请输入" @on-blur="setRow(row,index)" />
-            </template>-->
+            <template slot-scope="{ row, index }" slot="unitName">
+              <state
+                v-if="row.fieldType==1"
+                code="material.main.unitName"
+                :value="row.unitName"
+                type="text"
+              ></state>
+              <Dictionary
+                v-else
+                @on-change="setRow(row,index)"
+                v-model="row.unitName"
+                code="material.main.unitName"
+                type="select"
+                :value="row.unitName"
+                :key="row.unitName"
+              ></Dictionary>
+            </template>
             <template slot-scope="{ row, index }" slot="required">
               <Checkbox v-model="row.required" @on-change="setRow(row,index)"></Checkbox>
             </template>
@@ -129,12 +143,12 @@ export default {
           align: "center",
           slot: "dataType"
         },
-        // {
-        //   title: "是否显示",
-        //   key: "result",
-        //   align: "center",
-        //   slot: "result"
-        // },
+        {
+          title: "单位",
+          key: "unitName",
+          align: "center",
+          slot: "unitName"
+        },
         {
           title: "是否必填",
           key: "required",

pages/materiel/classification/masterData.vue

@@ -111,7 +111,7 @@ export default {
   },
   methods: {
     search() {
-      alert(JSON.stringify(this.easySearch));
+      // alert(JSON.stringify(this.easySearch));
       console.log(this.easySearch);
       this.$refs.grid.reload(this.easySearch);
     },