Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-11-04 43ce77a85d8297a53dc25430fff10ead57296167

 igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml

@@ -441,6 +441,73 @@
        <Property name="label">熏蒸作业人员</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtPest">
      <Property name="creationType">com.ld.igds.models.Pest</Property>
      <PropertyDef name="batchId">
        <Property/>
        <Property name="label">批次ID</Property>
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property/>
        <Property name="label">组织编码</Property>
      </PropertyDef>
      <PropertyDef name="depotId">
        <Property/>
        <Property name="label">仓库ID</Property>
      </PropertyDef>
      <PropertyDef name="pestMax">
        <Property name="dataType">int</Property>
        <Property name="label">最多数量</Property>
      </PropertyDef>
      <PropertyDef name="method">
        <Property/>
        <Property name="label">虫害检测方法</Property>
      </PropertyDef>
      <PropertyDef name="position">
        <Property/>
        <Property name="label">发生部位</Property>
      </PropertyDef>
      <PropertyDef name="pestType">
        <Property/>
        <Property name="label">虫害种类</Property>
      </PropertyDef>
      <PropertyDef name="pestLevel">
        <Property/>
        <Property name="label">虫粮等级判定</Property>
      </PropertyDef>
      <PropertyDef name="pestAnalysis">
        <Property/>
        <Property name="label">害虫抗药性分析</Property>
      </PropertyDef>
      <PropertyDef name="pestStart">
        <Property name="dataType">int</Property>
        <Property name="label">虫害采集点开始</Property>
      </PropertyDef>
      <PropertyDef name="pestEnd">
        <Property name="dataType">int</Property>
        <Property name="label">虫害采集点截至</Property>
      </PropertyDef>
      <PropertyDef name="checkNum">
        <Property name="dataType">int</Property>
        <Property name="label">采集通道个数</Property>
      </PropertyDef>
      <PropertyDef name="receiveDate">
        <Property name="dataType">Date</Property>
        <Property name="label">检测时间</Property>
      </PropertyDef>
      <PropertyDef name="points">
        <Property/>
        <Property name="label">采集点信息</Property>
      </PropertyDef>
      <PropertyDef name="checkUser">
        <Property/>
        <Property name="label">检测人</Property>
      </PropertyDef>
      <PropertyDef name="remark">
        <Property/>
        <Property name="label">备注信息</Property>
      </PropertyDef>
    </DataType>
  </Model>
  <View layout="padding:5;regionPadding:5">
    <Property name="packages">font-awesome,css-common</Property>
@@ -622,6 +689,7 @@
          <AutoFormElement>
            <Property name="name">pestBatchId</Property>
            <Property name="property">pestBatchId</Property>
            <Property name="trigger">cddPest</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -951,5 +1019,46 @@
      <Property name="items">片剂,注射剂,乳剂,丸剂,颗粒剂,其他</Property>
      <Property name="autoOpen">true</Property>
    </ListDropDown>
    <CustomDropDown id="cddPest">
      <ClientEvent name="onOpen">var key = view.get(&quot;#dsMain.data:#&quot;).get(&quot;depotId&quot;);&#xD;
console.log(key)&#xD;
view.get(&quot;#dsPest&quot;).set(&quot;parameter&quot;,{depotId:key}).flushAsync();</ClientEvent>
      <Property name="width">500</Property>
      <Property name="assignmentMap">pestBatchId=batchId</Property>
      <Property name="height">500</Property>
      <Property name="maxHeight">500</Property>
      <Property name="minHeight">500</Property>
      <Container layout="regionPadding:5">
        <DataSet id="dsPest">
          <Property name="dataType">[dtPest]</Property>
          <Property name="dataProvider">pestDataPR#getDataReport</Property>
          <Property name="pageSize">10</Property>
        </DataSet>
        <Container>
          <Property name="exClassName">bg-color</Property>
          <DataGrid id="dgPest" layoutConstraint="top">
            <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsPest.data:#&quot;);&#xD;
if(data){&#xD;
   view.get(&quot;#cddPest&quot;).close(data.toJSON());&#xD;
}</ClientEvent>
            <Property name="dataSet">dsPest</Property>
            <Property name="readOnly">true</Property>
            <DataColumn name="batchId">
              <Property name="property">batchId</Property>
            </DataColumn>
            <DataColumn name="receiveDate">
              <Property name="property">receiveDate</Property>
            </DataColumn>
          </DataGrid>
        </Container>
        <Container layoutConstraint="bottom">
          <Property name="exClassName">bg-color</Property>
          <DataPilot layoutConstraint="right">
            <Property name="dataSet">dsPest</Property>
            <Property name="itemCodes">pageSize,pages</Property>
          </DataPilot>
        </Container>
      </Container>
    </CustomDropDown>
  </View>
</ViewConfig>