Merge remote-tracking branch 'origin/master'

src/views/museums/specimeninfo/SpecimenInfoForm.vue

@@ -56,9 +56,9 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="成分" prop="composition">
-        <el-input v-model="formData.composition" placeholder="请输入成分"/>
-      </el-form-item>
+<!--      <el-form-item label="成分" prop="composition">-->
+<!--        <el-input v-model="formData.composition" placeholder="请输入成分"/>-->
+<!--      </el-form-item>-->
       <el-form-item label="产地" prop="country">
         <el-input v-model="formData.origin" placeholder="请输入产地"/>
       </el-form-item>
@@ -148,7 +148,7 @@
         <el-input v-model="formData.purpose" placeholder="请输入具体用途"/>
       </el-form-item>
       <el-form-item label="文献资料" prop="description">
-        <Editor v-model="formData.description" height="150px"/>
+        <Editor v-model="formData.description" height="250px"/>
       </el-form-item>
       <el-form-item label="馆藏状态" prop="collectionStatus">
         <el-radio-group v-model="formData.collectionStatus">
@@ -254,7 +254,7 @@ const formData = ref({
   provider: undefined,
   acquisitionTime: undefined,
   purpose: undefined,
-  description: undefined,
+  description: '',
   collectionStatus: undefined,
   notes: undefined,
   imageName: undefined,
@@ -374,7 +374,7 @@ const resetForm = () => {
     provider: undefined,
     acquisitionTime: undefined,
     purpose: undefined,
-    description: undefined,
+    description: '',
     collectionStatus: undefined,
     notes: undefined,
     imageName: undefined,

src/views/museums/specimeninfo/index.vue

@@ -28,21 +28,30 @@
           class="!w-240px"
         />
       </el-form-item>
-<!--      <el-form-item label="标本类型" prop="specimenType">-->
-<!--        <el-select-->
-<!--          v-model="queryParams.specimenType"-->
-<!--          placeholder="请选择标本类型（矿物、岩石矿石、化石、陨石）"-->
-<!--          clearable-->
-<!--          class="!w-240px"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="dict in getIntDictOptions(DICT_TYPE.MUSEUMS_SPECIMEN_TYPE)"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
+      <el-form-item label="标本类型" prop="specimenType">
+        <el-select
+          v-model="queryParams.specimenType"
+          placeholder="请选择标本类型（矿物、岩石矿石、化石、陨石）"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.MUSEUMS_SPECIMEN_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="存放位置" prop="storageLocation">
+        <el-input
+          v-model="queryParams.storageLocation"
+          placeholder="请输入存放位置"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
 <!--      <el-form-item label="资产号" prop="assetNumber">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.assetNumber"-->
@@ -52,15 +61,7 @@
 <!--          class="!w-240px"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="存放位置" prop="storageLocation">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.storageLocation"-->
-<!--          placeholder="请输入存放位置"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--          class="!w-240px"-->
-<!--        />-->
-<!--      </el-form-item>-->
+
 
 <!--      <el-form-item label="英文名称" prop="englishName">-->
 <!--        <el-input-->
@@ -89,15 +90,15 @@
 <!--          class="!w-240px"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="时代" prop="era">
-        <el-input
-          v-model="queryParams.era"
-          placeholder="请输入时代"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+<!--      <el-form-item label="时代" prop="era">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.era"-->
+<!--          placeholder="请输入时代"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="保存地层" prop="preservedLayer">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.preservedLayer"-->
@@ -116,15 +117,15 @@
 <!--          class="!w-240px"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="国际命名" prop="internationalName">
-        <el-input
-          v-model="queryParams.internationalName"
-          placeholder="请输入国际命名"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+<!--      <el-form-item label="国际命名" prop="internationalName">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.internationalName"-->
+<!--          placeholder="请输入国际命名"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="发现时间" prop="discoveryTime">-->
 <!--        <el-date-picker-->
 <!--          v-model="queryParams.discoveryTime"-->
@@ -180,21 +181,21 @@
 <!--          class="!w-240px"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="来源" prop="source">
-        <el-select
-          v-model="queryParams.source"
-          placeholder="请选择来源（采购、捐赠、采集）"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE. MUSEUMS_SOURCE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="来源" prop="source">-->
+<!--        <el-select-->
+<!--          v-model="queryParams.source"-->
+<!--          placeholder="请选择来源（采购、捐赠、采集）"-->
+<!--          clearable-->
+<!--          class="!w-240px"-->
+<!--        >-->
+<!--          <el-option-->
+<!--            v-for="dict in getIntDictOptions(DICT_TYPE. MUSEUMS_SOURCE)"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="标本提供者" prop="provider">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.provider"-->
@@ -215,15 +216,15 @@
           class="!w-220px"
         />
       </el-form-item>
-      <el-form-item label="用途" prop="purpose">
-        <el-input
-          v-model="queryParams.purpose"
-          placeholder="请输入用途"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+<!--      <el-form-item label="主要用途" prop="mainPurpose">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.mainPurpose"-->
+<!--          placeholder="请输入主要用途"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="馆藏状态" prop="collectionStatus">-->
 <!--        <el-select-->
 <!--          v-model="queryParams.collectionStatus"-->
@@ -588,7 +589,8 @@ const queryParams = reactive({
   createTime: [],
   deletedReason: undefined,
   operator: undefined,
-  entryDate: []
+  entryDate: [],
+  mainPurpose:undefined
 })
 //标签打印的表单
 const formData = ref({

src/views/museums/specimenoutbound/OutboundForm/ApproalDetails.vue

@@ -89,18 +89,7 @@
               <!--           </div>-->
             </el-col>
           </el-row>
-          <!--         <div style="text-align: right; margin-top: 20px;margin-right: 30px">-->
 
-          <!--           <el-button-->
-          <!--             v-if="outboundData.status !== 1 && outboundData.status !== 2 && outboundData.status !== 3 && outboundData.status !== 4"-->
-          <!--             link-->
-          <!--             type="danger"-->
-          <!--             plain-->
-          <!--             @click="handleApproval(outboundData.id)"-->
-          <!--           >-->
-          <!--             审批-->
-          <!--           </el-button>-->
-          <!--         </div>-->
         </el-card>
       </el-col>