修改组合查询

src/views/Breeding_records/Breeding_records/index.vue

@@ -386,8 +386,15 @@
       </template>
     </el-dialog>
   </div>
+
+  <div class="dialog-footer">
+    <el-button type="primary" @click="submitForm">确 定</el-button>
+    <el-button @click="cancel">取 消</el-button>
+  </div>
+
 </template>
 
+
 <script setup name="Breeding_records">
 import {
   listBreeding_records,
@@ -447,11 +454,15 @@ const data = reactive({
     breedType: [
       {required: true, message: "配种方式不能为空", trigger: "change"}
     ]
-  }
+  },
+  submitting: false
 })
 
 const {queryParams, form, rules} = toRefs(data)
 
+
+
+
 /** 获取配种方式文字显示 */
 function getBreedTypeText(breedType) {
   if (breedType === 1) return '同期发情'
@@ -489,6 +500,7 @@ function handleSortChange({column, prop, order}) {
 // 取消按钮
 function cancel() {
   open.value = false
+  submitting.value = false
   reset()
 }
 
@@ -618,6 +630,28 @@ function getRamInfoByTags() {
   }
 }
 
+// /** 提交按钮 */
+// function submitForm() {
+//   proxy.$refs["Breeding_recordsRef"].validate(valid => {
+//     if (valid) {
+//       if (form.value.id != null) {
+//         updateBreeding_records(form.value).then(response => {
+//           proxy.$modal.msgSuccess("修改成功")
+//           open.value = false
+//           getList()
+//         })
+//       } else {
+//         addBreeding_records(form.value).then(response => {
+//           proxy.$modal.msgSuccess("新增成功")
+//           open.value = false
+//           getList()
+//         })
+//       }
+//     }
+//   })
+// }
+
+/** 提交按钮 */
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs["Breeding_recordsRef"].validate(valid => {
@@ -627,12 +661,18 @@ function submitForm() {
           proxy.$modal.msgSuccess("修改成功")
           open.value = false
           getList()
+        }).catch(error => {
+          console.error('修改失败:', error)
+          proxy.$modal.msgError("修改失败，请查看控制台")
         })
       } else {
         addBreeding_records(form.value).then(response => {
           proxy.$modal.msgSuccess("新增成功")
           open.value = false
           getList()
+        }).catch(error => {
+          console.error('新增失败:', error)
+          proxy.$modal.msgError("新增失败，请查看控制台")
         })
       }
     }

src/views/fileManagement/sheep_file/index.vue

@@ -948,7 +948,7 @@
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -961,7 +961,7 @@
         <template #default="scope">
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['sheep_file:sheep_file:remove']">删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     
     <pagination

src/views/frozen/sale/index.vue

@@ -86,85 +86,45 @@
 
     <!-- 添加或修改销售主单对话框 -->
     <el-dialog :title="title" v-model="open" width="1200px" append-to-body>
-      <el-form ref="saleRef" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="saleRef" :model="form" :rules="rules" label-width="80px">
-
-        <!-- ================= 主单信息（两列布局） ================= -->
-        <el-row :gutter="20">
-          <el-col :span="12">
         <el-form-item label="销售日期" prop="saleDate">
-              <el-date-picker clearable v-model="form.saleDate" type="date" value-format="YYYY-MM-DD"
+          <el-date-picker clearable v-model="form.saleDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择销售日期">
-                placeholder="请选择销售日期" style="width: 100%" />
+          </el-date-picker>
         </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
         <el-form-item label="客户名称" prop="custName">
           <el-input v-model="form.custName" placeholder="请输入客户名称" />
         </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
         <el-form-item label="客户电话" prop="custPhone">
           <el-input v-model="form.custPhone" placeholder="请输入客户电话" />
         </el-form-item>
-          </el-col>
+        <el-form-item label="客户地址" prop="custAddr">
-
+          <el-input v-model="form.custAddr" type="textarea" placeholder="请输入内容" />
-          <el-col :span="12">
+        </el-form-item>
         <el-form-item label="销售人员" prop="salesper">
           <el-input v-model="form.salesper" placeholder="请输入销售人员" />
         </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
         <el-form-item label="检疫证号" prop="quaranNo">
           <el-input v-model="form.quaranNo" placeholder="请输入检疫证号" />
         </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
         <el-form-item label="审批编号" prop="apprNo">
           <el-input v-model="form.apprNo" placeholder="请输入审批编号" />
         </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
         <el-form-item label="总价" prop="price">
           <el-input v-model="form.price" placeholder="请输入总价" />
         </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
         <el-form-item label="技术员" prop="tech">
           <el-input v-model="form.tech" placeholder="请输入技术员" />
         </el-form-item>
-          </el-col>
-
-          <!-- 占满一整行 -->
-          <el-col :span="24">
-            <el-form-item label="客户地址" prop="custAddr">
-              <el-input v-model="form.custAddr" type="textarea" placeholder="请输入客户地址" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="24">
         <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-          </el-col>
-        </el-row>
-
-        <!-- ================= 销售明细 ================= -->
         <el-divider content-position="center">销售明细信息</el-divider>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" icon="Plus" @click="handleAddDdSaleItem">
+            <el-button type="primary" icon="Plus" @click="handleAddDdSaleItem">添加</el-button>
-              添加
-            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" icon="Delete" @click="handleDeleteDdSaleItem">
+            <el-button type="danger" icon="Delete" @click="handleDeleteDdSaleItem">删除</el-button>
-              删除
-            </el-button>
           </el-col>
         </el-row>
         <el-table :data="ddSaleItemList" :row-class-name="rowDdSaleItemIndex"
@@ -173,9 +133,9 @@
           <el-table-column label="序号" align="center" prop="index" width="50" />
           <el-table-column label="明细类型" prop="itemType" width="150">
             <template #default="scope">
-              <el-select v-model="scope.row.itemType" placeholder="请选择明细类型" style="width:100%">
+              <el-select v-model="scope.row.itemType" placeholder="请选择明细类型">
                 <el-option v-for="dict in frozen_sale_item_type" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
+                  :value="dict.value"></el-option>
               </el-select>
             </template>
           </el-table-column>

src/views/work/index.vue

@@ -176,10 +176,11 @@
 
           <el-col :span="12">
             <el-form-item label="执行部门" prop="department">
-              <el-select v-model="form.department" placeholder="请选择" style="width: 100%">
+              <input v-model="form.department" placeholder="请输入执行部门" />
+              <!-- <el-select v-model="form.department" placeholder="请选择" style="width: 100%">
                 <el-option label="免疫组" value="免疫组" />
                 <el-option label="饲喂组" value="饲喂组" />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -684,4 +685,4 @@ getList()
   min-height: 60px;
   line-height: 1.6
 }
-</style>
+</style>z