cz 1 jaar geleden
bovenliggende
commit
1d849c5444

+ 24 - 44
src/views/processApproval/components/EhsdContract.vue

@@ -7,68 +7,35 @@
       <van-tab :title="proxy.t('contract.otherCharges')" />
       <van-tab :title="proxy.t('contract.shipmentPlan')" />
       <div class="common-process-card" v-show="active == 0">
-        <div class="common-title">
-          {{ proxy.t("contract.transactionInformation") }}
+
+        <div style="margin-bottom:20px" v-if="route.query && route.query.businessId">
+          <testForm v-model="formData.data" :formOption="formOption" :formConfig="formConfigCode" :rules="rules" ref="formDom1">
+          </testForm>
         </div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formOption"
-          :formConfig="formConfig"
-          :rules="rules"
-          ref="formDom1"
-        >
+
+        <testForm v-model="formData.data" :formOption="formOption" :formConfig="formConfig" :rules="rules" ref="formDom1">
         </testForm>
       </div>
       <div class="common-process-card" v-show="active == 1">
         <div class="common-title">付款信息</div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formOption"
-          :formConfig="formConfigOne"
-          :rules="rules"
-          ref="formDom2"
-        >
+        <testForm v-model="formData.data" :formOption="formOption" :formConfig="formConfigOne" :rules="rules" ref="formDom2">
         </testForm>
       </div>
       <div class="common-process-card" v-show="active == 2">
         <div class="common-title">商品信息</div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formGoodsOption"
-          :formConfig="formEmptyConfig"
-          :rules="rules"
-          ref="formDom3"
-        >
+        <testForm v-model="formData.data" :formOption="formGoodsOption" :formConfig="formEmptyConfig" :rules="rules" ref="formDom3">
         </testForm>
       </div>
       <div class="common-process-card" v-show="active == 3">
         <div class="common-title">其他收费</div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formProjectOption"
-          :formConfig="formEmptyConfig"
-          :rules="rules"
-          ref="formDom4"
-        >
+        <testForm v-model="formData.data" :formOption="formProjectOption" :formConfig="formEmptyConfig" :rules="rules" ref="formDom4">
         </testForm>
-        <testForm
-          v-model="formData.data"
-          :formOption="formOption"
-          :formConfig="formAmountProjectConfig"
-          :rules="rules"
-          ref="formDom5"
-        >
+        <testForm v-model="formData.data" :formOption="formOption" :formConfig="formAmountProjectConfig" :rules="rules" ref="formDom5">
         </testForm>
       </div>
       <div class="common-process-card" v-show="active == 4">
         <div class="common-title">出货计划</div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formShipmentOption"
-          :formConfig="formEmptyConfig"
-          :rules="rulesTwo"
-          ref="formDom6"
-        >
+        <testForm v-model="formData.data" :formOption="formShipmentOption" :formConfig="formEmptyConfig" :rules="rulesTwo" ref="formDom6">
         </testForm>
       </div>
     </van-tabs>
@@ -127,6 +94,19 @@ const formOption = reactive({
   labelWidth: "62pk",
   hiddenSubmitBtn: true,
 });
+const formConfigCode = reactive([
+  {
+    type: "title",
+    title: "合同号",
+  },
+  {
+    type: "input",
+    label: "合同号",
+    prop: "code",
+    itemType: "text",
+    readonly: true,
+  },
+]);
 const formConfig = reactive([
   {
     type: "picker",

+ 25 - 42
src/views/processApproval/components/EhsdContractChange.vue

@@ -7,68 +7,38 @@
       <van-tab :title="proxy.t('contract.otherCharges')" />
       <van-tab :title="proxy.t('contract.shipmentPlan')" />
       <div class="common-process-card" v-show="active == 0">
+
+        <div style="margin-bottom:20px" v-if="route.query && route.query.businessId">
+          <testForm v-model="formData.data" :formOption="formOption" :formConfig="formConfigCode" :rules="rules" ref="formDom1">
+          </testForm>
+        </div>
+
         <div class="common-title">
           {{ proxy.t("contract.transactionInformation") }}
         </div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formOption"
-          :formConfig="formConfig"
-          :rules="rules"
-          ref="formDom1"
-        >
+        <testForm v-model="formData.data" :formOption="formOption" :formConfig="formConfig" :rules="rules" ref="formDom1">
         </testForm>
       </div>
       <div class="common-process-card" v-show="active == 1">
         <div class="common-title">付款信息</div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formOption"
-          :formConfig="formConfigOne"
-          :rules="rules"
-          ref="formDom2"
-        >
+        <testForm v-model="formData.data" :formOption="formOption" :formConfig="formConfigOne" :rules="rules" ref="formDom2">
         </testForm>
       </div>
       <div class="common-process-card" v-show="active == 2">
         <div class="common-title">商品信息</div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formGoodsOption"
-          :formConfig="formEmptyConfig"
-          :rules="rules"
-          ref="formDom3"
-        >
+        <testForm v-model="formData.data" :formOption="formGoodsOption" :formConfig="formEmptyConfig" :rules="rules" ref="formDom3">
         </testForm>
       </div>
       <div class="common-process-card" v-show="active == 3">
         <div class="common-title">其他收费</div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formProjectOption"
-          :formConfig="formEmptyConfig"
-          :rules="rules"
-          ref="formDom4"
-        >
+        <testForm v-model="formData.data" :formOption="formProjectOption" :formConfig="formEmptyConfig" :rules="rules" ref="formDom4">
         </testForm>
-        <testForm
-          v-model="formData.data"
-          :formOption="formOption"
-          :formConfig="formAmountProjectConfig"
-          :rules="rules"
-          ref="formDom5"
-        >
+        <testForm v-model="formData.data" :formOption="formOption" :formConfig="formAmountProjectConfig" :rules="rules" ref="formDom5">
         </testForm>
       </div>
       <div class="common-process-card" v-show="active == 4">
         <div class="common-title">出货计划</div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formShipmentOption"
-          :formConfig="formEmptyConfig"
-          :rules="rulesTwo"
-          ref="formDom6"
-        >
+        <testForm v-model="formData.data" :formOption="formShipmentOption" :formConfig="formEmptyConfig" :rules="rulesTwo" ref="formDom6">
         </testForm>
       </div>
     </van-tabs>
@@ -124,6 +94,19 @@ const formOption = reactive({
   labelWidth: "62pk",
   hiddenSubmitBtn: true,
 });
+const formConfigCode = reactive([
+  {
+    type: "title",
+    title: "合同号",
+  },
+  {
+    type: "input",
+    label: "合同号",
+    prop: "code",
+    itemType: "text",
+    readonly: true,
+  },
+]);
 const formConfig = reactive([
   {
     type: "picker",

+ 30 - 55
src/views/processApproval/components/EhsdPurchase.vue

@@ -7,88 +7,48 @@
       <van-tab :title="proxy.t('contract.otherCharges')" />
       <van-tab :title="'到货要求'" />
       <div class="common-process-card" v-show="active == 0">
+
+        <div style="margin-bottom:20px" v-if="route.query && route.query.businessId">
+          <testForm v-model="formData.data" :formOption="formOption" :formConfig="formConfigCode" :rules="rules" ref="formDom1">
+          </testForm>
+        </div>
+
         <div class="common-title">
           {{ proxy.t("contract.transactionInformation") }}
         </div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formOption"
-          :formConfig="formConfig"
-          :rules="rules"
-          ref="formDom1"
-        >
+
+        <testForm v-model="formData.data" :formOption="formOption" :formConfig="formConfig" :rules="rules" ref="formDom1">
         </testForm>
       </div>
       <div class="common-process-card" v-show="active == 1">
         <div class="common-title">付款信息</div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formOption"
-          :formConfig="formConfigOne"
-          :rules="rules"
-          ref="formDom2"
-        >
+        <testForm v-model="formData.data" :formOption="formOption" :formConfig="formConfigOne" :rules="rules" ref="formDom2">
         </testForm>
       </div>
       <div class="common-process-card" v-show="active == 2">
         <div class="common-title">商品信息</div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formGoodsOption"
-          :formConfig="formEmptyConfig"
-          :rules="rules"
-          ref="formDom3"
-        >
+        <testForm v-model="formData.data" :formOption="formGoodsOption" :formConfig="formEmptyConfig" :rules="rules" ref="formDom3">
         </testForm>
       </div>
       <div class="common-process-card" v-show="active == 3">
         <div class="common-title">其他收费</div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formProjectOption"
-          :formConfig="formEmptyConfig"
-          :rules="rules"
-          ref="formDom4"
-        >
+        <testForm v-model="formData.data" :formOption="formProjectOption" :formConfig="formEmptyConfig" :rules="rules" ref="formDom4">
         </testForm>
-        <testForm
-          v-model="formData.data"
-          :formOption="formOption"
-          :formConfig="formAmountProjectConfig"
-          :rules="rules"
-          ref="formDom5"
-        >
+        <testForm v-model="formData.data" :formOption="formOption" :formConfig="formAmountProjectConfig" :rules="rules" ref="formDom5">
           <template #remark>
             <div>
-              <van-button
-                plain
-                type="primary"
-                size="mini"
-                @click="showRemark = true"
-                >查看</van-button
-              >
+              <van-button plain type="primary" size="mini" @click="showRemark = true">查看</van-button>
             </div>
           </template>
         </testForm>
       </div>
       <div class="common-process-card" v-show="active == 4">
         <div class="common-title">到货要求</div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formShipmentOption"
-          :formConfig="formEmptyConfig"
-          :rules="rulesTwo"
-          ref="formDom6"
-        >
+        <testForm v-model="formData.data" :formOption="formShipmentOption" :formConfig="formEmptyConfig" :rules="rulesTwo" ref="formDom6">
         </testForm>
       </div>
     </van-tabs>
-    <van-popup
-      closeable
-      v-model:show="showRemark"
-      position="bottom"
-      :style="{ height: '40%' }"
-    >
+    <van-popup closeable v-model:show="showRemark" position="bottom" :style="{ height: '40%' }">
       <div style="padding: 10px; padding-bottom: 70px" class="remark-class">
         <div v-html="formData.data.remark"></div>
       </div>
@@ -148,6 +108,21 @@ const formOption = reactive({
   labelWidth: "62pk",
   hiddenSubmitBtn: true,
 });
+
+const formConfigCode = reactive([
+  {
+    type: "title",
+    title: "合同号",
+  },
+  {
+    type: "input",
+    label: "合同号",
+    prop: "code",
+    itemType: "text",
+    readonly: true,
+  },
+]);
+
 const formConfig = reactive([
   {
     type: "title",

+ 27 - 55
src/views/processApproval/components/EhsdPurchaseChange.vue

@@ -7,88 +7,47 @@
       <van-tab :title="proxy.t('contract.otherCharges')" />
       <van-tab :title="'到货要求'" />
       <div class="common-process-card" v-show="active == 0">
+
+        <div style="margin-bottom:20px" v-if="route.query && route.query.businessId">
+          <testForm v-model="formData.data" :formOption="formOption" :formConfig="formConfigCode" :rules="rules" ref="formDom1">
+          </testForm>
+        </div>
+
         <div class="common-title">
           {{ proxy.t("contract.transactionInformation") }}
         </div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formOption"
-          :formConfig="formConfig"
-          :rules="rules"
-          ref="formDom1"
-        >
+        <testForm v-model="formData.data" :formOption="formOption" :formConfig="formConfig" :rules="rules" ref="formDom1">
         </testForm>
       </div>
       <div class="common-process-card" v-show="active == 1">
         <div class="common-title">付款信息</div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formOption"
-          :formConfig="formConfigOne"
-          :rules="rules"
-          ref="formDom2"
-        >
+        <testForm v-model="formData.data" :formOption="formOption" :formConfig="formConfigOne" :rules="rules" ref="formDom2">
         </testForm>
       </div>
       <div class="common-process-card" v-show="active == 2">
         <div class="common-title">商品信息</div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formGoodsOption"
-          :formConfig="formEmptyConfig"
-          :rules="rules"
-          ref="formDom3"
-        >
+        <testForm v-model="formData.data" :formOption="formGoodsOption" :formConfig="formEmptyConfig" :rules="rules" ref="formDom3">
         </testForm>
       </div>
       <div class="common-process-card" v-show="active == 3">
         <div class="common-title">其他收费</div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formProjectOption"
-          :formConfig="formEmptyConfig"
-          :rules="rules"
-          ref="formDom4"
-        >
+        <testForm v-model="formData.data" :formOption="formProjectOption" :formConfig="formEmptyConfig" :rules="rules" ref="formDom4">
         </testForm>
-        <testForm
-          v-model="formData.data"
-          :formOption="formOption"
-          :formConfig="formAmountProjectConfig"
-          :rules="rules"
-          ref="formDom5"
-        >
+        <testForm v-model="formData.data" :formOption="formOption" :formConfig="formAmountProjectConfig" :rules="rules" ref="formDom5">
           <template #remark>
             <div>
-              <van-button
-                plain
-                type="primary"
-                size="mini"
-                @click="showRemark = true"
-                >查看</van-button
-              >
+              <van-button plain type="primary" size="mini" @click="showRemark = true">查看</van-button>
             </div>
           </template>
         </testForm>
       </div>
       <div class="common-process-card" v-show="active == 4">
         <div class="common-title">到货要求</div>
-        <testForm
-          v-model="formData.data"
-          :formOption="formShipmentOption"
-          :formConfig="formEmptyConfig"
-          :rules="rulesTwo"
-          ref="formDom6"
-        >
+        <testForm v-model="formData.data" :formOption="formShipmentOption" :formConfig="formEmptyConfig" :rules="rulesTwo" ref="formDom6">
         </testForm>
       </div>
     </van-tabs>
-    <van-popup
-      closeable
-      v-model:show="showRemark"
-      position="bottom"
-      :style="{ height: '40%' }"
-    >
+    <van-popup closeable v-model:show="showRemark" position="bottom" :style="{ height: '40%' }">
       <div style="padding: 10px; padding-bottom: 70px" class="remark-class">
         <div v-html="formData.data.remark"></div>
       </div>
@@ -148,6 +107,19 @@ const formOption = reactive({
   labelWidth: "62pk",
   hiddenSubmitBtn: true,
 });
+const formConfigCode = reactive([
+  {
+    type: "title",
+    title: "合同号",
+  },
+  {
+    type: "input",
+    label: "合同号",
+    prop: "code",
+    itemType: "text",
+    readonly: true,
+  },
+]);
 const formConfig = reactive([
   {
     type: "title",