Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-08-12 a673b25a0bc23b3b8b914088bdb7dca3d2e89d45

 igds-manager/src/main/java/com/ld/igds/oa/view/DeviceCheckup.view.xml

@@ -6,34 +6,34 @@
    <DataType name="dtMain">
      <Property name="creationType">com.ld.igds.models.DeviceCheckup</Property>
      <PropertyDef name="id">
        <Property/>
        <Property></Property>
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property/>
        <Property></Property>
        <Property name="label">组织编码</Property>
      </PropertyDef>
      <PropertyDef name="sbbh">
        <Property/>
        <Property></Property>
        <Property name="label">设备编号</Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
        <Property/>
        <Property></Property>
        <Property name="label">库区代码</Property>
      </PropertyDef>
      <PropertyDef name="kqmc">
        <Property/>
        <Property></Property>
        <Property name="label">库区名称</Property>
      </PropertyDef>
      <PropertyDef name="dwdm">
        <Property/>
        <Property></Property>
        <Property name="label">单位代码</Property>
      </PropertyDef>
      <PropertyDef name="sbyqmc">
        <Property/>
        <Property></Property>
        <Property name="label">设备仪器名称</Property>
      </PropertyDef>
      <PropertyDef name="sbyqdm">
        <Property/>
        <Property></Property>
        <Property name="label">设备仪器代码</Property>
      </PropertyDef>
      <PropertyDef name="jdsj">
@@ -41,12 +41,21 @@
        <Property name="label">检定时间</Property>
      </PropertyDef>
      <PropertyDef name="jddw">
        <Property/>
        <Property></Property>
        <Property name="label">检定单位</Property>
      </PropertyDef>
      <PropertyDef name="zhgxsj">
        <Property name="dataType">Date</Property>
        <Property name="label">最后更新时间</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="jdjg">
        <Property/>
        <Property name="label">检定结果</Property>
      </PropertyDef>
      <PropertyDef name="remark">
        <Property/>
        <Property name="label">备注</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtParam">
@@ -63,7 +72,7 @@
      </PropertyDef>
    </DataType>
  </Model>
  <View>
  <View layout="regionPadding:10">
    <ClientEvent name="onReady">view.get(&quot;#dsParam&quot;).insert({});</ClientEvent>
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
@@ -157,49 +166,50 @@
        <RowNumColumn>
          <Property name="caption">序号</Property>
        </RowNumColumn>
        <DataColumn name="id">
          <Property name="property">id</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="companyId">
          <Property name="property">companyId</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="sbbh">
          <Property name="property">sbbh</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
        </DataColumn>
        <DataColumn name="kqdm">
          <Property name="property">kqdm</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
        </DataColumn>
        <DataColumn name="kqmc">
          <Property name="property">kqmc</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
        </DataColumn>
        <DataColumn name="dwdm">
          <Property name="property">dwdm</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
        </DataColumn>
        <DataColumn name="sbyqmc">
          <Property name="property">sbyqmc</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
        </DataColumn>
        <DataColumn name="sbyqdm">
          <Property name="property">sbyqdm</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
        </DataColumn>
        <DataColumn name="jdsj">
          <Property name="property">jdsj</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
        </DataColumn>
        <DataColumn name="jddw">
          <Property name="property">jddw</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
        </DataColumn>
        <DataColumn name="zhgxsj">
          <Property name="property">zhgxsj</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
        </DataColumn>
      </DataGrid>
    </Container>
@@ -243,16 +253,6 @@
          <Property name="labelSeparator">：</Property>
          <Property name="labelWidth">150</Property>
          <AutoFormElement>
            <Property name="name">id</Property>
            <Property name="property">id</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">companyId</Property>
            <Property name="property">companyId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sbbh</Property>
            <Property name="property">sbbh</Property>
            <Editor/>
@@ -293,6 +293,17 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jdjg</Property>
            <Property name="property">jdjg</Property>
            <Property name="trigger">listDropYN</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">remark</Property>
            <Property name="property">remark</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zhgxsj</Property>
            <Property name="property">zhgxsj</Property>
            <Editor/>
@@ -313,5 +324,8 @@
      <Property name="service">deptDevicePR#delCheck</Property>
      <Property name="confirmMessage">确定要执行删除么？</Property>
    </AjaxAction>
    <ListDropDown id="listDropYN">
      <Property name="items">合格,不合格</Property>
    </ListDropDown>
  </View>
</ViewConfig>