update

src/services/go/ermcp/spot-contract/interface.ts

@@ -2,7 +2,7 @@
  * 现货合同请求
  */
 export interface Ermcp3ContractReq {
-    querytype: number    //  查询类型 1-未提交 2-待审核 3-履约中 4-已完成
+    querytype: string    //  查询类型 1-未提交 2-待审核 3-履约中 4-已完成
     usertype?: number    //  用户类型 2-机构 7-企业成员
     contractid?: string  //  合同ID(SpotContractId)
     contracttype?: number  // 合同类型 1-采购, -1-销售

src/views/business/plan/components/cancel/index.vue

@@ -55,7 +55,7 @@
                     </a-col>
                     <a-col :span="12">
                         <a-form-item label="结算币种">
-                            <span class="white">{{ formatValue(selectedRow.enumdicname) }}</span>
+                            <span class="white">{{ formatValue(selectedRow.currencyname) }}</span>
                         </a-form-item>
                     </a-col>
                 </a-row>

src/views/business/purchase/components/settlement/index.vue

@@ -1,321 +1,233 @@
 <template>
-  <!-- 交收登记-->
-  <a-modal class="commonModal paddingDialog settlement"
-           :title="selectedRow.contracttype===1? '采购合同-交收登记': '销售合同-交收登记'"
-           v-model:visible="visible"
-           centered
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                @click="cancel">取消
-      </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">交收登记
-      </a-button>
-    </template>
-    <fieldset class="formFieldSet">
-      <legend>合同基本信息</legend>
-      <a-form class="inlineForm">
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="合同编号">
-              <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="定价类型">
-              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item :label="selectedRow.contracttype===1? '采购方': '销售方'">
-              <span class="white">{{ formatValue(selectedRow.accountname) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="现货品种">
-              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="合同签署量">
-              <span
-                    class="white">{{ formatValue(selectedRow.qty + selectedRow.enumdicname) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="合同暂定价">
-              <span class="white">{{ formatValue(selectedRow.price) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </fieldset>
-    <fieldset class="formFieldSet">
-      <legend>已登记信息</legend>
-      <a-form class="inlineForm">
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="已定价量">
-              <span class="white">{{ selectedRow.pricedqty + " " + selectedRow.enumdicname }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="已交收量">
-              <span class="white">{{ selectedRow.reckonrealqty + " " + selectedRow.enumdicname }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="调整金额">
-              <span
-                    class="white">{{ selectedRow.reckonadjustamount + " 元" }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="保证金">
-              <span class="white">{{ selectedRow.margin + " 元" }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="其他费用">
-              <span
-                    class="white">{{ selectedRow.reckonotheramount + " 元" }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </fieldset>
-    <fieldset class="formFieldSet">
-      <legend>本次交收信息</legend>
-      <a-form class="inlineForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <a-checkbox-group class="commonCheckboxGroup">
-          <a-row>
-            <a-col :span="12">
-              <a-form-item class="relative">
-                <template #label>
-                  <a-checkbox value="交收量"
-                              v-model:checked="checkedObj.qty"
-                              @change="()=>checkedObj.qty = !checkedObj.qty">交收量</a-checkbox>
-                </template>
-                <a-form-item class="relative"
-                             v-if="checkedObj.qty"
-                             name="ReckonRealQty">
-                  <a-input-number v-model:value="formState.ReckonRealQty"
-                                  class="dialogInput"
-                                  style="width: 200px"
-                                  :min="0"
-                                  placeholder="请输入交收量"
-                                  suffix="单位" />
-                  <div class="tip mt10">
-                    <span>待交收量：{{selectedRow.unsureqty}}{{selectedRow.enumdicname}}</span><a
-                       class="blue fr"
-                       @click="formState.ReckonRealQty=selectedRow.unsureqty">全部登记</a>
-                  </div>
-                </a-form-item>
-                <a-form-item class="relative"
-                             v-else>
-                  <a-input-number disabled
-                                  class="dialogInput"
-                                  style="width: 200px"
-                                  :min="0"
-                                  placeholder="请输入交收量"
-                                  suffix="单位" />
-                  <div class="tip mt10"><span class="fl">未定价量：--{{selectedRow.enumdicname}}</span><a
-                       class="blue fr">全部登记</a>
-                  </div>
-                </a-form-item>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item class="relative">
-                <template #label>
-                  <a-checkbox value="其他费用"
-                              v-model:checked="checkedObj.amount"
-                              @change="()=>checkedObj.amount = !checkedObj.amount">其他费用</a-checkbox>
-                </template>
-                <a-form-item v-if="checkedObj.amount"
-                             name="ReckonOtherAmount">
-                  <a-input-number v-model:value="formState.ReckonOtherAmount"
-                                  class="dialogInput"
-                                  style="width: 200px"
-                                  :min="0"
-                                  placeholder="请输入其他费用"
-                                  suffix="元" />
-                </a-form-item>
-                <a-form-item v-else>
-                  <a-input-number readonly
-                                  class="dialogInput"
-                                  style="width: 200px"
-                                  :min="0"
-                                  placeholder="请输入其他费用"
-                                  suffix="元" />
-                </a-form-item>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12"
-                   class="mt10">
-              <a-form-item class="relative">
-                <template #label>
-                  <a-checkbox value="调整保证金"
-                              v-model:checked="checkedObj.margin"
-                              @change="()=>checkedObj.margin = !checkedObj.margin">调整保证金
-                  </a-checkbox>
-                </template>
-                <a-form-item class="relative"
-                             v-if="checkedObj.margin">
-                  <a-radio-group class="commonRadioGroup"
-                                 v-model:value="checkedObj.adjustMargin">
-                    <a-row style="width: 200px">
-                      <a-col :span="12">
-                        <a-radio :value="1">追加</a-radio>
-                      </a-col>
-                      <a-col :span="12">
-                        <a-radio :value="2">退还</a-radio>
-                      </a-col>
+    <!-- 交收登记-->
+    <a-modal class="commonModal paddingDialog settlement" :title="selectedRow.contracttype === 1 ? '采购合同-交收登记' : '销售合同-交收登记'" v-model:visible="visible" centered @cancel="cancel" width="890px">
+        <template #footer>
+            <a-button key="submit" class="cancelBtn" @click="cancel">取消 </a-button>
+            <a-button key="submit" type="primary" :loading="loading" @click="submit">交收登记 </a-button>
+        </template>
+        <fieldset class="formFieldSet">
+            <legend>合同基本信息</legend>
+            <a-form class="inlineForm">
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="合同编号">
+                            <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="定价类型">
+                            <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item :label="selectedRow.contracttype === 1 ? '采购方' : '销售方'">
+                            <span class="white">{{ formatValue(selectedRow.accountname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="现货品种">
+                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="合同签署量">
+                            <span class="white">{{ formatValue(selectedRow.qty + selectedRow.enumdicname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="商品价格">
+                            <span class="white">{{ formatValue(selectedRow.price) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </fieldset>
+        <fieldset class="formFieldSet">
+            <legend>已登记信息</legend>
+            <a-form class="inlineForm">
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="已定价量">
+                            <span class="white">{{ selectedRow.pricedqty + ' ' + selectedRow.enumdicname }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="已交收量">
+                            <span class="white">{{ selectedRow.reckonrealqty + ' ' + selectedRow.enumdicname }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="调整金额">
+                            <span class="white">{{ selectedRow.reckonadjustamount + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="保证金">
+                            <span class="white">{{ selectedRow.margin + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="24">
+                        <a-form-item label="其他费用">
+                            <span class="white">{{ selectedRow.reckonotheramount + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </fieldset>
+        <fieldset class="formFieldSet">
+            <legend>本次交收信息</legend>
+            <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+                <a-checkbox-group class="commonCheckboxGroup">
+                    <a-row>
+                        <a-col :span="12">
+                            <a-form-item class="relative">
+                                <template #label>
+                                    <a-checkbox value="交收量" v-model:checked="checkedObj.qty" @change="() => (checkedObj.qty = !checkedObj.qty)">交收量</a-checkbox>
+                                </template>
+                                <a-form-item class="relative" v-if="checkedObj.qty" name="ReckonRealQty">
+                                    <a-input-number v-model:value="formState.ReckonRealQty" class="dialogInput" style="width: 200px" :min="0" :max="selectedRow.unsureqty" placeholder="请输入交收量" suffix="单位" />
+                                    <div class="tip mt10">
+                                        <span>待交收量：{{ selectedRow.unsureqty }}{{ selectedRow.enumdicname }}</span
+                                        ><a class="blue fr" @click="formState.ReckonRealQty = selectedRow.unsureqty">全部登记</a>
+                                    </div>
+                                </a-form-item>
+                                <a-form-item class="relative" v-else>
+                                    <a-input-number disabled class="dialogInput" style="width: 200px" :min="0" placeholder="请输入交收量" suffix="单位" />
+                                    <div class="tip mt10"
+                                        ><span class="fl">未定价量：--{{ selectedRow.enumdicname }}</span
+                                        ><a class="blue fr">全部登记</a>
+                                    </div>
+                                </a-form-item>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item class="relative">
+                                <template #label>
+                                    <a-checkbox value="其他费用" v-model:checked="checkedObj.amount" @change="() => (checkedObj.amount = !checkedObj.amount)">其他费用</a-checkbox>
+                                </template>
+                                <a-form-item v-if="checkedObj.amount" name="ReckonOtherAmount">
+                                    <a-input-number v-model:value="formState.ReckonOtherAmount" class="dialogInput" style="width: 200px" :min="0" placeholder="请输入其他费用" suffix="元" />
+                                </a-form-item>
+                                <a-form-item v-else>
+                                    <a-input-number readonly class="dialogInput" style="width: 200px" :min="0" placeholder="请输入其他费用" suffix="元" />
+                                </a-form-item>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12" class="mt10">
+                            <a-form-item class="relative">
+                                <template #label>
+                                    <a-checkbox value="调整保证金" v-model:checked="checkedObj.margin" @change="() => (checkedObj.margin = !checkedObj.margin)">调整保证金 </a-checkbox>
+                                </template>
+                                <a-form-item class="relative" v-if="checkedObj.margin">
+                                    <a-radio-group class="commonRadioGroup" v-model:value="checkedObj.adjustMargin">
+                                        <a-row style="width: 200px">
+                                            <a-col :span="12">
+                                                <a-radio :value="1">追加</a-radio>
+                                            </a-col>
+                                            <a-col :span="12">
+                                                <a-radio :value="2">退还</a-radio>
+                                            </a-col>
+                                        </a-row>
+                                    </a-radio-group>
+                                    <div class="tip mt10">
+                                        <a-form-item name="AddMargin" v-if="checkedObj.adjustMargin === 1">
+                                            <a-input-number v-model:value="formState.AddMargin" class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整保证金" suffix="元" />
+                                        </a-form-item>
+                                        <a-form-item name="DecMargin" v-else>
+                                            <a-input-number v-model:value="formState.DecMargin" class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整保证金" suffix="元" />
+                                        </a-form-item>
+                                    </div>
+                                </a-form-item>
+                                <a-form-item class="relative" v-else>
+                                    <a-radio-group class="commonRadioGroup" disabled>
+                                        <a-row style="width: 200px">
+                                            <a-col :span="12">
+                                                <a-radio :value="1">追加</a-radio>
+                                            </a-col>
+                                            <a-col :span="12">
+                                                <a-radio :value="2">退还</a-radio>
+                                            </a-col>
+                                        </a-row>
+                                    </a-radio-group>
+                                    <div class="tip mt10">
+                                        <a-input-number disabled class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整保证金" suffix="元" />
+                                    </div>
+                                </a-form-item>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12" class="mt10">
+                            <a-form-item class="relative">
+                                <template #label>
+                                    <a-checkbox value="调整金额" v-model:checked="checkedObj.justAmount" @change="() => (checkedObj.justAmount = !checkedObj.justAmount)">调整金额 </a-checkbox>
+                                </template>
+                                <a-form-item class="relative" v-if="checkedObj.justAmount">
+                                    <a-radio-group class="commonRadioGroup" v-model:value="checkedObj.adjustAmount">
+                                        <a-row style="width: 200px">
+                                            <a-col :span="12">
+                                                <a-radio
+                                                    :value="1"
+                                                    @focus="
+                                                        () => {
+                                                            formState.ReckonAdjustAmount ? (formState.ReckonAdjustAmount = Math.abs(formState.ReckonAdjustAmount)) : 0;
+                                                        }
+                                                    "
+                                                >
+                                                    增加</a-radio
+                                                >
+                                            </a-col>
+                                            <a-col :span="12">
+                                                <a-radio
+                                                    :value="2"
+                                                    @focus="
+                                                        () => {
+                                                            formState.ReckonAdjustAmount ? (formState.ReckonAdjustAmount = -1 * Math.abs(formState.ReckonAdjustAmount)) : 0;
+                                                        }
+                                                    "
+                                                >
+                                                    减少</a-radio
+                                                >
+                                            </a-col>
+                                        </a-row>
+                                    </a-radio-group>
+                                    <div class="tip mt10">
+                                        <a-form-item name="ReckonAdjustAmount">
+                                            <a-input-number v-model:value="formState.ReckonAdjustAmount" @change="formState.ReckonAdjustAmount = Math.abs(formState.ReckonAdjustAmount)" class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整金额" suffix="元" v-if="checkedObj.adjustAmount === 1" />
+                                            <a-input-number v-model:value="formState.ReckonAdjustAmount" @change="formState.ReckonAdjustAmount = -1 * Math.abs(formState.ReckonAdjustAmount)" class="dialogInput" :min="0" style="width: 200px" placeholder="请输入调整金额" suffix="元" v-else />
+                                        </a-form-item>
+                                    </div>
+                                </a-form-item>
+                                <a-form-item class="relative" v-else>
+                                    <a-radio-group class="commonRadioGroup" disabled>
+                                        <a-row style="width: 200px">
+                                            <a-col :span="12">
+                                                <a-radio :value="1">增加</a-radio>
+                                            </a-col>
+                                            <a-col :span="12">
+                                                <a-radio :value="2">减少</a-radio>
+                                            </a-col>
+                                        </a-row>
+                                    </a-radio-group>
+                                    <div class="tip mt10">
+                                        <a-input-number disabled class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整金额" suffix="元" />
+                                    </div>
+                                </a-form-item>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="备注" class="relative mt20 pl40">
+                                <a-input class="dialogInput" style="width: 600px" placeholder="请输入备注信息" v-model:value="formState.Remark" />
+                            </a-form-item>
+                        </a-col>
                     </a-row>
-                  </a-radio-group>
-                  <div class="tip mt10">
-                    <a-form-item name="AddMargin"
-                                 v-if="checkedObj.adjustMargin === 1">
-                      <a-input-number v-model:value="formState.AddMargin"
-                                      class="dialogInput"
-                                      style="width: 200px;"
-                                      :min="0"
-                                      placeholder="请输入调整保证金"
-                                      suffix="元" />
-                    </a-form-item>
-                    <a-form-item name="DecMargin"
-                                 v-else>
-                      <a-input-number v-model:value="formState.DecMargin"
-                                      class="dialogInput"
-                                      style="width: 200px;"
-                                      :min="0"
-                                      placeholder="请输入调整保证金"
-                                      suffix="元" />
-                    </a-form-item>
-                  </div>
-                </a-form-item>
-                <a-form-item class="relative"
-                             v-else>
-                  <a-radio-group class="commonRadioGroup"
-                                 disabled>
-                    <a-row style="width: 200px">
-                      <a-col :span="12">
-                        <a-radio :value="1">追加</a-radio>
-                      </a-col>
-                      <a-col :span="12">
-                        <a-radio :value="2">退还</a-radio>
-                      </a-col>
-                    </a-row>
-                  </a-radio-group>
-                  <div class="tip mt10">
-                    <a-input-number disabled
-                                    class="dialogInput"
-                                    style="width: 200px;"
-                                    :min="0"
-                                    placeholder="请输入调整保证金"
-                                    suffix="元" />
-                  </div>
-                </a-form-item>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12"
-                   class="mt10">
-              <a-form-item class="relative">
-                <template #label>
-                  <a-checkbox value="调整金额"
-                              v-model:checked="checkedObj.justAmount"
-                              @change="()=>checkedObj.justAmount = !checkedObj.justAmount">调整金额
-                  </a-checkbox>
-                </template>
-                <a-form-item class="relative"
-                             v-if="checkedObj.justAmount">
-                  <a-radio-group class="commonRadioGroup"
-                                 v-model:value="checkedObj.adjustAmount">
-                    <a-row style="width: 200px">
-                      <a-col :span="12">
-                        <a-radio :value="1"
-                                 @focus="()=>{formState.ReckonAdjustAmount  ?formState.ReckonAdjustAmount= Math.abs(formState.ReckonAdjustAmount):0}">
-                          增加</a-radio>
-                      </a-col>
-                      <a-col :span="12">
-                        <a-radio :value="2"
-                                 @focus="()=>{formState.ReckonAdjustAmount  ?formState.ReckonAdjustAmount= -1* Math.abs(formState.ReckonAdjustAmount):0}">
-                          减少</a-radio>
-                      </a-col>
-                    </a-row>
-                  </a-radio-group>
-                  <div class="tip mt10">
-                    <a-form-item name="ReckonAdjustAmount">
-                      <a-input-number v-model:value="formState.ReckonAdjustAmount"
-                                      @change="formState.ReckonAdjustAmount= Math.abs(formState.ReckonAdjustAmount)"
-                                      class="dialogInput"
-                                      style="width: 200px;"
-                                      :min="0"
-                                      placeholder="请输入调整金额"
-                                      suffix="元"
-                                      v-if="checkedObj.adjustAmount===1" />
-                      <a-input-number v-model:value="formState.ReckonAdjustAmount"
-                                      @change="formState.ReckonAdjustAmount= -1*Math.abs(formState.ReckonAdjustAmount)"
-                                      class="dialogInput"
-                                      :min="0"
-                                      style="width: 200px;"
-                                      placeholder="请输入调整金额"
-                                      suffix="元"
-                                      v-else />
-                    </a-form-item>
-                  </div>
-                </a-form-item>
-                <a-form-item class="relative"
-                             v-else>
-                  <a-radio-group class="commonRadioGroup"
-                                 disabled>
-                    <a-row style="width: 200px">
-                      <a-col :span="12">
-                        <a-radio :value="1">增加</a-radio>
-                      </a-col>
-                      <a-col :span="12">
-                        <a-radio :value="2">减少</a-radio>
-                      </a-col>
-                    </a-row>
-                  </a-radio-group>
-                  <div class="tip mt10">
-                    <a-input-number disabled
-                                    class="dialogInput"
-                                    style="width: 200px;"
-                                    :min="0"
-                                    placeholder="请输入调整金额"
-                                    suffix="元" />
-                  </div>
-                </a-form-item>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="备注"
-                           class="relative mt20 pl40">
-                <a-input class="dialogInput"
-                         style="width: 600px"
-                         placeholder="请输入备注信息"
-                         v-model:value="formState.Remark" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-checkbox-group>
-        <a-form-item name="IsChecked"></a-form-item>
-      </a-form>
-    </fieldset>
-  </a-modal>
+                </a-checkbox-group>
+                <a-form-item name="IsChecked"></a-form-item>
+            </a-form>
+        </fieldset>
+    </a-modal>
 </template>
 
 <script lang="ts">

src/views/business/purchase/components/storage/index.vue

@@ -1,60 +1,45 @@
 <template>
-  <!-- 采购合同-入库登记-->
-  <a-modal class="commonModal"
-           title="采购合同-入库登记"
-           v-model:visible="visible"
-           centered
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                @click="cancel">取消</a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">入库登记</a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <fieldset class="formFieldSet">
-        <legend>合同基本信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="合同编号">
-              <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item :label="selectedRow.contracttype===1? '采购方': '销售方'">
-              <span class="white">{{ formatValue(selectedRow.accountname) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="现货品种">
-              <span class="white">{{formatValue(selectedRow.deliverygoodsname)}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="合同签署量">
-              <span class="white">{{formatValue(selectedRow.qty)}}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>已登记信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12"
-                 v-for="(item, i) in DGList"
-                 :key="i">
-            <a-form-item label="已入库量">
-              <span class="white">{{item.wrstandardname}} + {{item.brandname}}</span>
-            </a-form-item>
-          </a-col>
-          <!-- <a-col :span="12">
+    <!-- 采购合同-入库登记-->
+    <a-modal class="commonModal" title="采购合同-入库登记" v-model:visible="visible" centered @cancel="cancel" width="890px">
+        <template #footer>
+            <a-button key="submit" class="cancelBtn" @click="cancel">取消</a-button>
+            <a-button key="submit" type="primary" :loading="loading" @click="submit">入库登记</a-button>
+        </template>
+        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+            <fieldset class="formFieldSet">
+                <legend>合同基本信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="合同编号">
+                            <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item :label="selectedRow.contracttype === 1 ? '采购方' : '销售方'">
+                            <span class="white">{{ formatValue(selectedRow.accountname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="现货品种">
+                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="合同签署量">
+                            <span class="white">{{ formatValue(selectedRow.qty) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>已登记信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12" v-for="(item, i) in DGList" :key="i">
+                        <a-form-item label="已入库量">
+                            <span class="white">{{ item.wrstandardname }} + {{ item.brandname }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <!-- <a-col :span="12">
             <a-form-item label="已入库量2">
               <span class="white">品类2+品牌2（66吨）</span>
             </a-form-item>
@@ -69,67 +54,41 @@
               <span class="white">品类4+品牌4（5吨）</span>
             </a-form-item>
           </a-col> -->
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>本次入库信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="品类">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        placeholder="请选择品类"
-                        v-model:value="selectedRow.wrstandardid"
-                        readonly>
-                <a-select-option v-for="option in gmlist"
-                                 :key="option.wrstandardid"
-                                 :value="option.wrstandardid">{{option.wrstandardname}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="品牌"
-                         name="SpotGoodsBrandID">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        placeholder="请选择品牌"
-                        v-model:value="formState.SpotGoodsBrandID">
-                <a-select-option v-for="option in gblist"
-                                 :key="option.brandid"
-                                 :value="option.brandid">{{option.brandname}}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="入库仓库"
-                         name="WarehouseInfo">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        placeholder="请选择入库仓库"
-                        v-model:value="formState.WarehouseInfo">
-                <a-select-option v-for="option in wareHouseList"
-                                 :key="option.autoid"
-                                 :value="option.autoid">{{option.warehousename}}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="入库数量"
-                         name="Qty">
-              <a-input-number class="dialogInput"
-                              style="width: 200px"
-                              suffix="单位"
-                              :min="0"
-                              placeholder="请输入入库数量"
-                              v-model:value="formState.Qty">
-              </a-input-number>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-    </a-form>
-  </a-modal>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>本次入库信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="品类">
+                            <a-select class="inlineFormSelect" style="width: 200px" placeholder="请选择品类" v-model:value="selectedRow.wrstandardid" readonly>
+                                <a-select-option v-for="option in gmlist" :key="option.wrstandardid" :value="option.wrstandardid">{{ option.wrstandardname }} </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="品牌" name="SpotGoodsBrandID">
+                            <a-select class="inlineFormSelect" style="width: 200px" placeholder="请选择品牌" v-model:value="formState.SpotGoodsBrandID">
+                                <a-select-option v-for="option in gblist" :key="option.brandid" :value="option.brandid">{{ option.brandname }}</a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="入库仓库" name="WarehouseInfo">
+                            <a-select class="inlineFormSelect" style="width: 200px" placeholder="请选择入库仓库" v-model:value="formState.WarehouseInfo">
+                                <a-select-option v-for="option in wareHouseList" :key="option.autoid" :value="option.autoid">{{ option.warehousecode }}</a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="入库数量" name="Qty">
+                            <a-input-number class="dialogInput" style="width: 200px" suffix="单位" :min="0" placeholder="请输入入库数量" v-model:value="formState.Qty"> </a-input-number>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">

src/views/business/purchase/list/all/index.vue

@@ -1,41 +1,41 @@
 <template>
-    <!-- 采购合同: 特点价合同-待交收合同-->
-    <div class="purchase-peddding" :loading="loading">
-        <filterCustomTable @search="updateColumn"></filterCustomTable>
-        <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
-            </template>
-            <template #pricedqty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #unsureqty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #qty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #unpricedqty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #unpayamount="{ record }">
-                <span>{{ record.unpayamount.toFixed(2) }}</span>
-            </template>
-            <template #daikaiamount="{ record }">
-                <span>{{ record.daikaiamount.toFixed(2) }}</span>
-            </template>
-            <template #deliverystartdate,deliveryenddate="{ record }">
-                <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
-            </template>
-            <template #startdate,enddate="{ record }">
-                <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-    </div>
+  <!-- 采购合同: 特点价合同-待交收合同-->
+  <div class="purchase-peddding" :loading="loading">
+    <filterCustomTable @search="updateColumn"></filterCustomTable>
+    <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
+      </template>
+      <template #pricedqty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #unsureqty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #qty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #unpricedqty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #unpayamount="{ record }">
+        <span>{{ record.unpayamount.toFixed(2) }}</span>
+      </template>
+      <template #daikaiamount="{ record }">
+        <span>{{ record.daikaiamount.toFixed(2) }}</span>
+      </template>
+      <template #deliverystartdate,deliveryenddate="{ record }">
+        <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
+      </template>
+      <template #startdate,enddate="{ record }">
+        <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
+      </template>
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+  </div>
 </template>
 
 <script lang="ts">

src/views/business/search/plan/index.vue

@@ -31,7 +31,7 @@ export default defineComponent({
         const { loading, tableList, queryTable } = queryTableList<Ermcp3HedgePlan>();
 
         // 获取列表数据
-        const queryTableAction = () => queryTable(QueryHedgePlan, '0,1,2,3,4,5,6');
+        const queryTableAction = () => queryTable(QueryHedgePlan, '2,3');
 
         // 表格通用逻辑
         const param: ComposeTableParam = {

src/views/business/search/plan/setup.ts

@@ -51,8 +51,8 @@ export const columns: ColumnType[] = [
     },
     {
         title: '商品',
-        dataIndex: 'enumdicname',
-        key: 'enumdicname',
+        dataIndex: 'wrstandardname',
+        key: 'wrstandardname',
         align: 'center',
         width: 120,
     },

src/views/business/sell/components/settlement/index.vue

@@ -1,318 +1,229 @@
 <template>
-  <!-- 交收登记-->
-  <a-modal class="commonModal paddingDialog settlement"
-           title="交收登记"
-           v-model:visible="visible"
-           @cancel="cancel"
-           centered
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                @click="cancel">取消
-      </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">交收登记
-      </a-button>
-    </template>
-    <fieldset class="formFieldSet">
-      <legend>合同基本信息</legend>
-      <a-form class="inlineForm">
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="合同编号">
-              <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="定价类型">
-              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item :label="selectedRow.contracttype===1? '采购方': '销售方'">
-              <span class="white">{{ formatValue(selectedRow.accountname) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="现货品种">
-              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="合同签署量">
-              <span
-                    class="white">{{ formatValue(selectedRow.qty + selectedRow.enumdicname) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="合同暂定价">
-              <span class="white">{{ formatValue(selectedRow.price) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </fieldset>
-    <fieldset class="formFieldSet">
-      <legend>已登记信息</legend>
-      <a-form class="inlineForm">
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="已定价量">
-              <span class="white">{{ selectedRow.pricedqty + " " +  selectedRow.enumdicname }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="已交收量">
-              <span class="white">{{ selectedRow.reckonrealqty + " " +  selectedRow.enumdicname }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="调整金额">
-              <span
-                    class="white">{{ selectedRow.reckonadjustamount + " 元"}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="保证金">
-              <span class="white">{{ selectedRow.margin + " 元" }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="其他费用">
-              <span
-                    class="white">{{ selectedRow.reckonotheramount + " 元" }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </fieldset>
-    <fieldset class="formFieldSet">
-      <legend>本次交收信息</legend>
-      <a-form class="inlineForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <a-checkbox-group class="commonCheckboxGroup">
-          <a-row>
-            <a-col :span="12">
-              <a-form-item class="relative">
-                <template #label>
-                  <a-checkbox value="交收量"
-                              v-model:checked="checkedObj.qty"
-                              @change="()=>checkedObj.qty = !checkedObj.qty">交收量</a-checkbox>
-                </template>
-                <a-form-item class="relative"
-                             v-if="checkedObj.qty"
-                             name="ReckonRealQty">
-                  <a-input-number v-model:value="formState.ReckonRealQty"
-                                  class="dialogInput"
-                                  style="width: 200px"
-                                  :min="0"
-                                  placeholder="请输入交收量"
-                                  suffix="单位" />
-                  <div class="tip mt10"><span>待交收量：{{selectedRow.unsureqty}}吨</span><a
-                       class="blue fr"
-                       @click="formState.ReckonRealQty=selectedRow.unsureqty">全部登记</a></div>
-                </a-form-item>
-                <a-form-item class="relative"
-                             v-else>
-                  <a-input-number disabled
-                                  class="dialogInput"
-                                  style="width: 200px"
-                                  :min="0"
-                                  placeholder="请输入交收量"
-                                  suffix="单位" />
-                  <div class="tip mt10"><span class="fl">未定价量：--吨</span><a class="blue fr">全部登记</a>
-                  </div>
-                </a-form-item>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item class="relative">
-                <template #label>
-                  <a-checkbox value="其他费用"
-                              v-model:checked="checkedObj.amount"
-                              @change="()=>checkedObj.amount = !checkedObj.amount">其他费用</a-checkbox>
-                </template>
-                <a-form-item v-if="checkedObj.amount"
-                             name="ReckonOtherAmount">
-                  <a-input-number v-model:value="formState.ReckonOtherAmount"
-                                  class="dialogInput"
-                                  style="width: 200px"
-                                  placeholder="请输入其他费用"
-                                  :min="0"
-                                  suffix="元" />
-                </a-form-item>
-                <a-form-item v-else>
-                  <a-input-number readonly
-                                  class="dialogInput"
-                                  style="width: 200px"
-                                  placeholder="请输入其他费用"
-                                  :min="0"
-                                  suffix="元" />
-                </a-form-item>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12"
-                   class="mt10">
-              <a-form-item class="relative">
-                <template #label>
-                  <a-checkbox value="调整保证金"
-                              v-model:checked="checkedObj.margin"
-                              @change="()=>checkedObj.margin = !checkedObj.margin">调整保证金
-                  </a-checkbox>
-                </template>
-                <a-form-item class="relative"
-                             v-if="checkedObj.margin">
-                  <a-radio-group class="commonRadioGroup"
-                                 v-model:value="checkedObj.adjustMargin">
-                    <a-row style="width: 200px">
-                      <a-col :span="12">
-                        <a-radio :value="1">追加</a-radio>
-                      </a-col>
-                      <a-col :span="12">
-                        <a-radio :value="2">退还</a-radio>
-                      </a-col>
+    <!-- 交收登记-->
+    <a-modal class="commonModal paddingDialog settlement" title="交收登记" v-model:visible="visible" @cancel="cancel" centered width="890px">
+        <template #footer>
+            <a-button key="submit" class="cancelBtn" @click="cancel">取消 </a-button>
+            <a-button key="submit" type="primary" :loading="loading" @click="submit">交收登记 </a-button>
+        </template>
+        <fieldset class="formFieldSet">
+            <legend>合同基本信息</legend>
+            <a-form class="inlineForm">
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="合同编号">
+                            <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="定价类型">
+                            <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item :label="selectedRow.contracttype === 1 ? '采购方' : '销售方'">
+                            <span class="white">{{ formatValue(selectedRow.accountname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="现货品种">
+                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="合同签署量">
+                            <span class="white">{{ formatValue(selectedRow.qty + selectedRow.enumdicname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="商品价格">
+                            <span class="white">{{ formatValue(selectedRow.price) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </fieldset>
+        <fieldset class="formFieldSet">
+            <legend>已登记信息</legend>
+            <a-form class="inlineForm">
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="已定价量">
+                            <span class="white">{{ selectedRow.pricedqty + ' ' + selectedRow.enumdicname }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="已交收量">
+                            <span class="white">{{ selectedRow.reckonrealqty + ' ' + selectedRow.enumdicname }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="调整金额">
+                            <span class="white">{{ selectedRow.reckonadjustamount + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="保证金">
+                            <span class="white">{{ selectedRow.margin + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="24">
+                        <a-form-item label="其他费用">
+                            <span class="white">{{ selectedRow.reckonotheramount + ' 元' }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </fieldset>
+        <fieldset class="formFieldSet">
+            <legend>本次交收信息</legend>
+            <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+                <a-checkbox-group class="commonCheckboxGroup">
+                    <a-row>
+                        <a-col :span="12">
+                            <a-form-item class="relative">
+                                <template #label>
+                                    <a-checkbox value="交收量" v-model:checked="checkedObj.qty" @change="() => (checkedObj.qty = !checkedObj.qty)">交收量</a-checkbox>
+                                </template>
+                                <a-form-item class="relative" v-if="checkedObj.qty" name="ReckonRealQty">
+                                    <a-input-number v-model:value="formState.ReckonRealQty" class="dialogInput" style="width: 200px" :min="0" :max="selectedRow.unsureqty" placeholder="请输入交收量" suffix="单位" />
+                                    <div class="tip mt10"
+                                        ><span>待交收量：{{ selectedRow.unsureqty }}吨</span><a class="blue fr" @click="formState.ReckonRealQty = selectedRow.unsureqty">全部登记</a></div
+                                    >
+                                </a-form-item>
+                                <a-form-item class="relative" v-else>
+                                    <a-input-number disabled class="dialogInput" style="width: 200px" :min="0" placeholder="请输入交收量" suffix="单位" />
+                                    <div class="tip mt10"><span class="fl">未定价量：--吨</span><a class="blue fr">全部登记</a> </div>
+                                </a-form-item>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item class="relative">
+                                <template #label>
+                                    <a-checkbox value="其他费用" v-model:checked="checkedObj.amount" @change="() => (checkedObj.amount = !checkedObj.amount)">其他费用</a-checkbox>
+                                </template>
+                                <a-form-item v-if="checkedObj.amount" name="ReckonOtherAmount">
+                                    <a-input-number v-model:value="formState.ReckonOtherAmount" class="dialogInput" style="width: 200px" placeholder="请输入其他费用" :min="0" suffix="元" />
+                                </a-form-item>
+                                <a-form-item v-else>
+                                    <a-input-number readonly class="dialogInput" style="width: 200px" placeholder="请输入其他费用" :min="0" suffix="元" />
+                                </a-form-item>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12" class="mt10">
+                            <a-form-item class="relative">
+                                <template #label>
+                                    <a-checkbox value="调整保证金" v-model:checked="checkedObj.margin" @change="() => (checkedObj.margin = !checkedObj.margin)">调整保证金 </a-checkbox>
+                                </template>
+                                <a-form-item class="relative" v-if="checkedObj.margin">
+                                    <a-radio-group class="commonRadioGroup" v-model:value="checkedObj.adjustMargin">
+                                        <a-row style="width: 200px">
+                                            <a-col :span="12">
+                                                <a-radio :value="1">追加</a-radio>
+                                            </a-col>
+                                            <a-col :span="12">
+                                                <a-radio :value="2">退还</a-radio>
+                                            </a-col>
+                                        </a-row>
+                                    </a-radio-group>
+                                    <div class="tip mt10">
+                                        <a-form-item name="AddMargin" v-if="checkedObj.adjustMargin === 1">
+                                            <a-input-number v-model:value="formState.AddMargin" class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整保证金" suffix="元" />
+                                        </a-form-item>
+                                        <a-form-item name="DecMargin" v-else>
+                                            <a-input-number v-model:value="formState.DecMargin" class="dialogInput" :min="0" style="width: 200px" placeholder="请输入调整保证金" suffix="元" />
+                                        </a-form-item>
+                                    </div>
+                                </a-form-item>
+                                <a-form-item class="relative" v-else>
+                                    <a-radio-group class="commonRadioGroup" disabled>
+                                        <a-row style="width: 200px">
+                                            <a-col :span="12">
+                                                <a-radio :value="1">追加</a-radio>
+                                            </a-col>
+                                            <a-col :span="12">
+                                                <a-radio :value="2">退还</a-radio>
+                                            </a-col>
+                                        </a-row>
+                                    </a-radio-group>
+                                    <div class="tip mt10">
+                                        <a-input-number disabled class="dialogInput" style="width: 200px" :min="0" placeholder="请输入调整保证金" suffix="元" />
+                                    </div>
+                                </a-form-item>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12" class="mt10">
+                            <a-form-item class="relative">
+                                <template #label>
+                                    <a-checkbox value="调整金额" v-model:checked="checkedObj.justAmount" @change="() => (checkedObj.justAmount = !checkedObj.justAmount)">调整金额 </a-checkbox>
+                                </template>
+                                <a-form-item class="relative" v-if="checkedObj.justAmount">
+                                    <a-radio-group class="commonRadioGroup" v-model:value="checkedObj.adjustAmount">
+                                        <a-row style="width: 200px">
+                                            <a-col :span="12">
+                                                <a-radio
+                                                    :value="1"
+                                                    @focus="
+                                                        () => {
+                                                            formState.ReckonAdjustAmount ? (formState.ReckonAdjustAmount = Math.abs(formState.ReckonAdjustAmount)) : 0;
+                                                        }
+                                                    "
+                                                >
+                                                    增加</a-radio
+                                                >
+                                            </a-col>
+                                            <a-col :span="12">
+                                                <a-radio
+                                                    :value="2"
+                                                    @focus="
+                                                        () => {
+                                                            formState.ReckonAdjustAmount ? (formState.ReckonAdjustAmount = -1 * Math.abs(formState.ReckonAdjustAmount)) : 0;
+                                                        }
+                                                    "
+                                                >
+                                                    减少</a-radio
+                                                >
+                                            </a-col>
+                                        </a-row>
+                                    </a-radio-group>
+                                    <div class="tip mt10">
+                                        <a-form-item name="ReckonAdjustAmount">
+                                            <a-input-number v-model:value="formState.ReckonAdjustAmount" @change="formState.ReckonAdjustAmount = Math.abs(formState.ReckonAdjustAmount)" class="dialogInput" style="width: 200px" placeholder="请输入调整金额" :min="0" suffix="元" v-if="checkedObj.adjustAmount === 1" />
+                                            <a-input-number v-model:value="formState.ReckonAdjustAmount" @change="formState.ReckonAdjustAmount = -1 * Math.abs(formState.ReckonAdjustAmount)" class="dialogInput" :min="0" style="width: 200px" placeholder="请输入调整金额" suffix="元" v-else />
+                                        </a-form-item>
+                                    </div>
+                                </a-form-item>
+                                <a-form-item class="relative" v-else>
+                                    <a-radio-group class="commonRadioGroup" disabled>
+                                        <a-row style="width: 200px">
+                                            <a-col :span="12">
+                                                <a-radio :value="1">增加</a-radio>
+                                            </a-col>
+                                            <a-col :span="12">
+                                                <a-radio :value="2">减少</a-radio>
+                                            </a-col>
+                                        </a-row>
+                                    </a-radio-group>
+                                    <div class="tip mt10">
+                                        <a-input-number disabled class="dialogInput" style="width: 200px" placeholder="请输入调整金额" :min="0" suffix="元" />
+                                    </div>
+                                </a-form-item>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="备注" class="relative mt20 pl40">
+                                <a-input class="dialogInput" style="width: 600px" placeholder="请输入备注信息" v-model:value="formState.Remark" />
+                            </a-form-item>
+                        </a-col>
                     </a-row>
-                  </a-radio-group>
-                  <div class="tip mt10">
-                    <a-form-item name="AddMargin"
-                                 v-if="checkedObj.adjustMargin === 1">
-                      <a-input-number v-model:value="formState.AddMargin"
-                                      class="dialogInput"
-                                      style="width: 200px;"
-                                      :min="0"
-                                      placeholder="请输入调整保证金"
-                                      suffix="元" />
-                    </a-form-item>
-                    <a-form-item name="DecMargin"
-                                 v-else>
-                      <a-input-number v-model:value="formState.DecMargin"
-                                      class="dialogInput"
-                                      :min="0"
-                                      style="width: 200px;"
-                                      placeholder="请输入调整保证金"
-                                      suffix="元" />
-                    </a-form-item>
-                  </div>
-                </a-form-item>
-                <a-form-item class="relative"
-                             v-else>
-                  <a-radio-group class="commonRadioGroup"
-                                 disabled>
-                    <a-row style="width: 200px">
-                      <a-col :span="12">
-                        <a-radio :value="1">追加</a-radio>
-                      </a-col>
-                      <a-col :span="12">
-                        <a-radio :value="2">退还</a-radio>
-                      </a-col>
-                    </a-row>
-                  </a-radio-group>
-                  <div class="tip mt10">
-                    <a-input-number disabled
-                                    class="dialogInput"
-                                    style="width: 200px;"
-                                    :min="0"
-                                    placeholder="请输入调整保证金"
-                                    suffix="元" />
-                  </div>
-                </a-form-item>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12"
-                   class="mt10">
-              <a-form-item class="relative">
-                <template #label>
-                  <a-checkbox value="调整金额"
-                              v-model:checked="checkedObj.justAmount"
-                              @change="()=>checkedObj.justAmount = !checkedObj.justAmount">调整金额
-                  </a-checkbox>
-                </template>
-                <a-form-item class="relative"
-                             v-if="checkedObj.justAmount">
-                  <a-radio-group class="commonRadioGroup"
-                                 v-model:value="checkedObj.adjustAmount">
-                    <a-row style="width: 200px">
-                      <a-col :span="12">
-                        <a-radio :value="1"
-                                 @focus="()=>{formState.ReckonAdjustAmount  ?formState.ReckonAdjustAmount= Math.abs(formState.ReckonAdjustAmount):0}">
-                          增加</a-radio>
-                      </a-col>
-                      <a-col :span="12">
-                        <a-radio :value="2"
-                                 @focus="()=>{formState.ReckonAdjustAmount  ?formState.ReckonAdjustAmount= -1* Math.abs(formState.ReckonAdjustAmount):0}">
-                          减少</a-radio>
-                      </a-col>
-                    </a-row>
-                  </a-radio-group>
-                  <div class="tip mt10">
-                    <a-form-item name="ReckonAdjustAmount">
-                      <a-input-number v-model:value="formState.ReckonAdjustAmount"
-                                      @change="formState.ReckonAdjustAmount= Math.abs(formState.ReckonAdjustAmount)"
-                                      class="dialogInput"
-                                      style="width: 200px;"
-                                      placeholder="请输入调整金额"
-                                      :min="0"
-                                      suffix="元"
-                                      v-if="checkedObj.adjustAmount===1" />
-                      <a-input-number v-model:value="formState.ReckonAdjustAmount"
-                                      @change="formState.ReckonAdjustAmount= -1*Math.abs(formState.ReckonAdjustAmount)"
-                                      class="dialogInput"
-                                      :min="0"
-                                      style="width: 200px;"
-                                      placeholder="请输入调整金额"
-                                      suffix="元"
-                                      v-else />
-                    </a-form-item>
-                  </div>
-                </a-form-item>
-                <a-form-item class="relative"
-                             v-else>
-                  <a-radio-group class="commonRadioGroup"
-                                 disabled>
-                    <a-row style="width: 200px">
-                      <a-col :span="12">
-                        <a-radio :value="1">增加</a-radio>
-                      </a-col>
-                      <a-col :span="12">
-                        <a-radio :value="2">减少</a-radio>
-                      </a-col>
-                    </a-row>
-                  </a-radio-group>
-                  <div class="tip mt10">
-                    <a-input-number disabled
-                                    class="dialogInput"
-                                    style="width: 200px;"
-                                    placeholder="请输入调整金额"
-                                    :min="0"
-                                    suffix="元" />
-                  </div>
-                </a-form-item>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="备注"
-                           class="relative mt20 pl40">
-                <a-input class="dialogInput"
-                         style="width: 600px"
-                         placeholder="请输入备注信息"
-                         v-model:value="formState.Remark" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-checkbox-group>
-        <a-form-item name="IsChecked"></a-form-item>
-      </a-form>
-    </fieldset>
-  </a-modal>
+                </a-checkbox-group>
+                <a-form-item name="IsChecked"></a-form-item>
+            </a-form>
+        </fieldset>
+    </a-modal>
 </template>
 
 <script lang="ts">

src/views/information/spot-contract/components/delete/index.vue

@@ -1,27 +1,12 @@
 <template>
-  <!-- 删除现货合同--->
-  <a-modal class="recover-custom commonModal addSpotVariety"
-           title="删除现货合同"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                :loading="loading"
-                :disabled="loading"
-                @click="cancel">取消</a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                :disabled="loading"
-                @click="submit">确认删除</a-button>
-    </template>
-    <InfoDetail :selectedRow="selectedRow" />
-
-  </a-modal>
+    <!-- 删除现货合同--->
+    <a-modal class="recover-custom commonModal addSpotVariety" title="撤销现货合同" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
+        <template #footer>
+            <a-button key="submit" class="cancelBtn" :loading="loading" :disabled="loading" @click="cancel">取消</a-button>
+            <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="submit">确认撤销</a-button>
+        </template>
+        <InfoDetail :selectedRow="selectedRow" />
+    </a-modal>
 </template>
 
 <script lang="ts">
@@ -52,8 +37,8 @@ export default defineComponent({
         // 获取 业务账户
         function submit() {
             Modal.confirm({
-                title: '是否确认删除',
-                okText: '确认删除',
+                title: '是否确认撤销',
+                okText: '确认撤销',
                 cancelText: '取消',
                 onOk() {
                     let params: GldErmcpSpotContractOperateReq = {
@@ -81,10 +66,4 @@ export default defineComponent({
         };
     },
 });
-</script>
-
-<style lang="less">
-.recover-custom {
-}
-</style
->;
+</script>

src/views/information/spot-contract/components/filterTable/index.vue

@@ -17,15 +17,6 @@ export default defineComponent({
         const select: SelectList[] = [
             {
                 value: undefined,
-                key: 'contracttype',
-                placeholder: '全部合同类型',
-                list: [
-                    { value: 1, lable: '采购' },
-                    { value: -1, lable: '销售' },
-                ],
-            },
-            {
-                value: undefined,
                 key: 'pricetype',
                 placeholder: '全部定价类型',
                 list: [

src/views/information/spot-contract/list/audit/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <!-- 现货合同: 待审核-->
+    <!-- 现货合同: 待审核-已审核-->
     <div class="spot-contract-peddding" :loading="loading">
         <filterCustomTable @search="updateColumn"></filterCustomTable>
         <a-table :columns="columns" class="topTable" :pagination="false" rowKey="key" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :data-source="tableList" :scroll="{ x: 'calc(100% - 160px)', y: 'calc(100vh - 163px)' }">

src/views/information/spot-contract/list/purchase/index.vue

@@ -1,56 +1,56 @@
 <template>
-    <!-- 采购合同: 新增合同-已完结合同-->
-    <div class="spot-contract-not-commit" :loading="loading">
-        <filterCustomTable @search="updateColumn">
-            <mtp-table-button :buttons="firstBtn" @click="openComponent" />
-        </filterCustomTable>
-        <a-table :columns="columns" class="srcollYTable" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
-            <!-- 额外的展开行 -->
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="secondBtn" :record="record" @click="openComponent" />
-            </template>
-            <template #biztype="{ text }">
-                <a>{{ getBizTypeName(text) }}</a>
-            </template>
-            <template #pricetype="{ text }">
-                <span>{{ getPriceTypeName(text) }}</span>
-            </template>
-            <template #contracctstatus="{ text }">
-                <a>{{ getContractStatusName(text) }}</a>
-            </template>
-            <template #contracttype="{ text }">
-                <a>{{ getContractTypeName(text) }}</a>
-            </template>
-            <!-- 对手方 -->
-            <template #negative="{ record }">
-                <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
-            </template>
-            <!-- 点假期 -->
-            <template #startdate="{ record }">
-                <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
-            </template>
-            <!-- 交收期 -->
-            <template #deliverystartdate="{ record }">
-                <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
-            </template>
-            <!-- 业务员 -->
-            <template #saleuserid="{ record }">
-                <span>{{ findManagerName(record.saleuserid) }}</span>
-            </template>
-            <!-- 跟单员 -->
-            <template #meruserid="{ record }">
-                <span>{{ findManagerName(record.meruserid) }}</span>
-            </template>
-            <!-- 合同量 -->
-            <template #qty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-    </div>
+  <!-- 采购合同: 新增合同-已完结合同-->
+  <div class="spot-contract-not-commit" :loading="loading">
+    <filterCustomTable @search="updateColumn">
+      <mtp-table-button :buttons="firstBtn" @click="openComponent" />
+    </filterCustomTable>
+    <a-table :columns="columns" class="srcollYTable" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+      <!-- 额外的展开行 -->
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <mtp-table-button class="btn-list-sticky" :buttons="secondBtn" :record="record" @click="openComponent" />
+      </template>
+      <template #biztype="{ text }">
+        <a>{{ getBizTypeName(text) }}</a>
+      </template>
+      <template #pricetype="{ text }">
+        <span>{{ getPriceTypeName(text) }}</span>
+      </template>
+      <template #contracctstatus="{ text }">
+        <a>{{ getContractStatusName(text) }}</a>
+      </template>
+      <template #contracttype="{ text }">
+        <a>{{ getContractTypeName(text) }}</a>
+      </template>
+      <!-- 对手方 -->
+      <template #negative="{ record }">
+        <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
+      </template>
+      <!-- 点假期 -->
+      <template #startdate="{ record }">
+        <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
+      </template>
+      <!-- 交收期 -->
+      <template #deliverystartdate="{ record }">
+        <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
+      </template>
+      <!-- 业务员 -->
+      <template #saleuserid="{ record }">
+        <span>{{ findManagerName(record.saleuserid) }}</span>
+      </template>
+      <!-- 跟单员 -->
+      <template #meruserid="{ record }">
+        <span>{{ findManagerName(record.meruserid) }}</span>
+      </template>
+      <!-- 合同量 -->
+      <template #qty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"> </contextMenu>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+  </div>
 </template>
 
 <script lang="ts">
@@ -89,23 +89,32 @@ export default defineComponent({
             switch (routeName) {
                 // 新增合同
                 case 'purchase_contract':
-                    queryTable(QuerySpotContract, { contracttype: 1 });
+                    queryTable(QuerySpotContract, { contracttype: 1, querytype: '1,2' });
                     break;
                 // 已完结合同
                 case 'purchase_finish':
-                    queryTable(QuerySpotContract, { contracttype: 1, querytype: 4 });
+                    queryTable(QuerySpotContract, { contracttype: 1, querytype: '4' });
                     break;
             }
             // 获取 业务账户
             queryBusinessManager();
         };
 
+        // function handleButton(item: Ermcp3ContractRsp) {
+        //     const { contracctstatus } = item;
+        //     if (['']) {
+        //         return btnList;
+        //     } else {
+        //         return btnList.filter((e) => e.code === 'detail');
+        //     }
+        // }
+
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
             menuType: EnumRouterName.spot_contract_unsubmitted,
             tableName: 'table_pcweb_delivery',
-            tableFilterKey: ['contracttype', 'pricetype', 'contractno'],
+            tableFilterKey: ['pricetype', 'contractno'],
             tableFilterCB,
             isDetail: true,
         };

src/views/information/spot-contract/list/sell/index.vue

@@ -89,11 +89,11 @@ export default defineComponent({
             switch (routeName) {
                 // 新增合同
                 case 'sell_contract':
-                    queryTable(QuerySpotContract, { contracttype: -1, querytype: 1 });
+                    queryTable(QuerySpotContract, { contracttype: -1, querytype: '1,2' });
                     break;
                 // 已完结合同
                 case 'sell_finish':
-                    queryTable(QuerySpotContract, { contracttype: -1, querytype: 4 });
+                    queryTable(QuerySpotContract, { contracttype: -1, querytype: '4' });
                     break;
             }
             // 获取 业务账户

src/views/information/spot-contract/list/setup.ts

@@ -6,7 +6,7 @@ import { message } from 'ant-design-vue';
 import { ref } from 'vue';
 
 // 1-未提交 2-待审核 3-履约中 4-已完成
-type EnumType = 1 | 2 | 3 | 4;
+type EnumType = '1' | '2' | '3' | '4';
 
 /**
  * 获取表格列表数据

src/views/manage/business-review/components/somepriceCancel/index.vue

@@ -1,103 +1,87 @@
 <template>
-  <!-- 撤销点价登记-->
-  <a-modal class="add-custom custom-detail"
-           title="撤销点价登记"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="cancel">关闭
-      </a-button>
+    <!-- 撤销点价登记-->
+    <a-modal class="add-custom custom-detail" title="撤销点价登记" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
+        <template #footer>
+            <a-button key="submit" type="primary" :loading="loading" @click="cancel">关闭 </a-button>
 
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="back">撤销
-      </a-button>
-    </template>
-    <a-form class="inlineForm"
-            :form="form"
-            @submit="handleSearch">
-      <fieldset class="formFieldSet">
-        <legend>合同基本信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="合同编号">
-              <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="点价类型">
-              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="销售方">
-              <span class="white">{{ formatValue(selectedRow.sellusername) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="现货品种">
-              <span class="white">{{ formatValue(selectedRow.buyusername) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>待审核登记信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="点价合约">
-              <span class="white">{{ formatValue(selectedRow.goodsname) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="点价价格">
-              <span class="white">{{ formatValue(selectedRow.pricedPrice) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="升贴水">
-              <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="点价数量">
-              <span class="white">{{ formatValue(selectedRow.pricedQty) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="点价金额">
-              <span class="white">{{ formatValue(selectedRow.amount) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="登记时间">
-              <span class="white">{{ formatValue(selectedRow.applytime) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="登记人">
-              <span class="white">{{ formatValue(selectedRow.auditname) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-    </a-form>
-  </a-modal>
+            <a-button key="submit" type="primary" :loading="loading" @click="back">撤销 </a-button>
+        </template>
+        <a-form class="inlineForm" :form="form" @submit="handleSearch">
+            <fieldset class="formFieldSet">
+                <legend>合同基本信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="合同编号">
+                            <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="点价类型">
+                            <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="销售方">
+                            <span class="white">{{ formatValue(selectedRow.sellusername) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="现货品种">
+                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>待审核登记信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="点价合约">
+                            <span class="white">{{ formatValue(selectedRow.goodsname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="点价价格">
+                            <span class="white">{{ formatValue(selectedRow.pricedPrice) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="升贴水">
+                            <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="点价数量">
+                            <span class="white">{{ formatValue(selectedRow.pricedQty) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="点价金额">
+                            <span class="white">{{ formatValue(selectedRow.amount) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="登记时间">
+                            <span class="white">{{ formatValue(selectedRow.applytime) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="登记人">
+                            <span class="white">{{ formatValue(selectedRow.auditname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">

src/views/manage/business-review/components/somepriceDetail/index.vue

@@ -28,7 +28,7 @@
                     </a-col>
                     <a-col :span="12">
                         <a-form-item label="现货品种">
-                            <span class="white">{{ formatValue(selectedRow.buyusername) }}</span>
+                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
                         </a-form-item>
                     </a-col>
                 </a-row>

src/views/manage/business-review/list/someprice/index.vue

@@ -76,7 +76,6 @@ export default defineComponent({
                     queryTable(QueryBusinessDj, { applystatus: '2' }).then(res => {
                         tableList.value = sortTime<QryBusinessDjRsp>(res, 'audittime', false);
                     });;
-                    break;
             }
         };
 

src/views/manage/finance-review/list/funds/index.vue

@@ -62,8 +62,8 @@ export default defineComponent({
         Filter,
         MtpTableButton,
         detail: defineAsyncComponent(() => import('../../components/fundsDetail/index.vue')),
-        funds_checkpending_check: defineAsyncComponent(() => import('../../components/fundsAudit/index.vue')),
-        funds_checkpending_cancel: defineAsyncComponent(() => import('../../components/fundsCancel/index.vue')),
+        check: defineAsyncComponent(() => import('../../components/fundsAudit/index.vue')),
+        cancel: defineAsyncComponent(() => import('../../components/fundsCancel/index.vue')),
     },
     setup() {
         const { name: routeName } = useRoute();
@@ -100,7 +100,6 @@ export default defineComponent({
             }
         };
 
-
         // 获取表头名称
         const getTableName = () => {
             switch (routeName) {

src/views/manage/inventory-review/list/audit/index.vue

@@ -74,7 +74,7 @@ export default defineComponent({
                     break;
                 // 已审核
                 case 'stock_performance':
-                    queryTable(QueryAreaStockApply, { applystatus: '2,5' });
+                    queryTable(QueryAreaStockApply, { applystatus: '2' });
                     break;
             }
         };
@@ -94,7 +94,6 @@ export default defineComponent({
             }
         };
 
-
         // 获取表头名称
         const getTableName = () => {
             switch (routeName) {