物料

components/page/dtSpan.vue

@@ -17,7 +17,7 @@ export default {
   props: {
     type: {
       type: String,
-      default: 'dateTime'
+      default: 'date'
     },
     value: {
       type: String,

pages/materiel/masterData/details.vue

@@ -17,7 +17,7 @@
           <!-- <Button type="primary">编辑</Button> -->
           <div class="new-detail">
             <Row>
-              <Filed :span="8" name="编码：">{{entity.code}}</Filed>
+              <Filed :span="8" name="编码：">{{!entity.code?'未分配':entity.code}}</Filed>
               <Filed :span="8" name="名称：">{{entity.name}}</Filed>
               <Filed :span="8" name="状态：">
                 <State code="materail.category.status" :value="parseInt(entity.status)" />
@@ -31,8 +31,13 @@
                 <State v-if="li.dataType==3" :code="li.note" :value="entity[li.field]" />
                 <div v-else-if="li.dataType==8">{{entity[li.field]}}</div>
                 <div v-else-if="li.dataType==5" v-html="entity[li.field]"></div>
+                <DTSpan v-else-if="li.dataType==4" :value="entity[li.field]" />
                 <span v-else>{{entity[li.field]}}</span>
-                <span v-if="li.unitName" v-text="li.unitName" class="ml10"></span>
+                <State
+                  v-if="li.unitName&&(li.dataType==1||li.dataType==2)"
+                  :code="li.note"
+                  :value="entity[li.field]"
+                />
               </Filed>
             </Row>
           </div>
@@ -112,12 +117,15 @@ export default {
           }).then(r => {
             if (r.result) {
               this.fileds = r.result.filter(function(item) {
+                console.log(item);
                 item.span = 8;
                 if (item.dataType == 8 || item.dataType == 5) {
                   item.span = 24;
                 }
+
                 return item.fieldType != 1;
               });
+
               this.fileds.map(u => {
                 let v = "";
                 if (u.dataType == 1 || u.dataType == 2) {

pages/materiel/masterData/submit.vue

@@ -17,8 +17,13 @@
             <State v-if="li.dataType==3" :code="li.note" :value="entity[li.field]" />
             <div v-else-if="li.dataType==8">{{entity[li.field]}}</div>
             <div v-else-if="li.dataType==5" v-html="entity[li.field]"></div>
+            <DTSpan v-else-if="li.dataType==4" :value="entity[li.field]" />
             <span v-else>{{entity[li.field]}}</span>
-            <State v-if="li.unitName" :code="li.note" :value="entity[li.field]" />
+            <State
+              v-if="li.unitName&&(li.dataType==1||li.dataType==2)"
+              :code="li.note"
+              :value="entity[li.field]"
+            />
             <!-- <span v-if="li.unitName" v-text="li.unitName" class="ml10"></span> -->
           </Filed>
         </Row>