Forráskód Böngészése

前端合同修改sdy

zhongtianhaoyuan 4 éve
szülő
commit
ad6afa8ce7

+ 258 - 260
src/views/contractManagement/purchaseContractEdit.vue

@@ -1,7 +1,7 @@
 <!--销售合同-->
 <!--2019年5月30日 20:25:16 by jlx-->
 <template>
-  <div class='container'>
+  <div class="container">
     <el-row>
       <el-col :span="12">
         <h2 class="bg-left title">修改合同信息</h2>
@@ -12,146 +12,112 @@
           type="primary"
           size="small"
           @click="returnsales()"
-          ><img width='6' height='10' style='vertical-align: bottom;margin-right:3px;' src="../../../public/img/lujing.png" alt=""> 返回</el-button
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />
+          返回</el-button
         >
       </el-col>
     </el-row>
-   
     <ws-form
       ref="deptBudgetList"
       :rules="mainReportAdd"
       :model="deptBudgetList"
     >
       <div class="remark">
-      <h3>基本信息</h3>
-      <p style='color:#8890B1;'>
-        &nbsp;&nbsp;注:基本信息和货物信息均为必填项,“*”
-        标记的条目提交后不可修改。
-      </p>
+        <h3>基本信息</h3>
+        <p style="color: #8890b1">
+          &nbsp;&nbsp;注:基本信息和货物信息均为必填项,“*”
+          标记的条目提交后不可修改。
+        </p>
       </div>
-        <ws-info-table>
-          <ws-form-item class='readonly'
-            label="合同编号"
-            span="1"
-            prop="contractNo"
-          >
-          {{deptBudgetList.contractNo}}
-          </ws-form-item>
-          <ws-form-item
-            label="运输方式"
-            
-            span="1"
-            prop="shippingType"
-          >
+      <ws-info-table>
+        <!-- 合同编号 -->
+        <ws-form-item
+          class="readonly"
+          label="合同编号"
+          span="1"
+          prop="contractNo"
+        >
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
+
+        <!-- 运输方式 -->
+        <ws-form-item label="运输方式" span="1" prop="shippingType">
           <ws-input
-              v-model="deptBudgetList.shippingType"
-              maxlength="100"
-              placeholder="请输入运输方式"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item  class='readonly'
-            label="买方"
-            span="1"
-            prop="buyer"
-          >
-          {{deptBudgetList.buyer}}
-          </ws-form-item>
-          <ws-form-item
-            label="结算方式"
-            span="1"
-            prop="settlementMethod"
-            
-          >
+            v-model="deptBudgetList.shippingType"
+            maxlength="100"
+            placeholder="请输入运输方式"
+            size="small"
+          />
+        </ws-form-item>
+
+        <!-- 买方 -->
+        <ws-form-item class="readonly" label="买方" span="1" prop="buyer">
+          {{ deptBudgetList.buyer }}
+        </ws-form-item>
+        <!-- 交货方式 -->
+        <ws-form-item label="结算方式" span="1" prop="settlementMethod">
           <ws-input
-              v-model="deptBudgetList.settlementMethod"
-              maxlength="100"
-              placeholder="请输入结算方式"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item  class='readonly'
-            label="卖方"
-            span="1"
-            prop="seller"
-          >{{deptBudgetList.seller}}
-          </ws-form-item>
-          <ws-form-item
-            label="货源地"
-            span="1"
-            prop="sourceGoods"
-            
-          >
+            v-model="deptBudgetList.settlementMethod"
+            maxlength="100"
+            placeholder="请输入结算方式"
+            size="small"
+          />
+        </ws-form-item>
+        <!-- 卖方 -->
+        <ws-form-item class="readonly" label="卖方" span="1" prop="seller"
+          >{{ deptBudgetList.seller }}
+        </ws-form-item>
+
+        <ws-form-item
+          class="readonly"
+          label="交货方式"
+          span="1"
+          prop="sourceGoods"
+        >
+
+          {{ deptBudgetList.deliverType }}
+        </ws-form-item>
+        <!-- 买方电话 -->
+        <ws-form-item label="买方电话" span="1" prop="buyerPhone">
           <ws-input
-              v-model="deptBudgetList.sourceGoods"
-              maxlength="100"
-              placeholder="请输入货源地"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            label="买方电话"
-            span="1"
-            prop="buyerPhone"
+            v-model="deptBudgetList.buyerPhone"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <!-- 包装方式 -->
+        <ws-form-item label="包装方式" span="1" prop="packingMethod">
+          <ws-select
+            v-model="deptBudgetList.packingMethod"
+            placeholder=""
+            class="typeselect"
+            @change="selectpackingMethod"
           >
-          <ws-input
-              v-model="deptBudgetList.buyerPhone"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            label="交货地"
-            span="1"
-            prop="placeDelivery">
-            <ws-input
-              v-model="deptBudgetList.placeDelivery"
-              maxlength="100"
-              size="small"
-              placeholder="请输入交货地"
-            />
-          </ws-form-item>
-           <ws-form-item
-            label="卖方电话"
-            span="1"
-            prop="sellerPhone">
-            <ws-input
-              v-model="deptBudgetList.sellerPhone"
-              maxlength="100"
-              size="small"
-              placeholder="请输入卖方电话"
+            <ws-option
+              v-for="item in packtypeList"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
             />
-          </ws-form-item>
-          <ws-form-item
-            label="包装方式"
-            span="1"
-            prop="packingMethod">
-            <ws-select
-          v-model="deptBudgetList.packingMethod"
-          placeholder=""
-          class="typeselect"
-          @change="selectpackingMethod"
-        >
-          <ws-option
-            v-for="item in packtypeList"
-            :key="item.constKey"
-            :label="item.constValue"
-            :value="item.constValue"
+          </ws-select>
+        </ws-form-item>
+        <!-- 卖方电话 -->
+        <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
+          <ws-input
+            v-model="deptBudgetList.sellerPhone"
+            maxlength="100"
+            size="small"
+            placeholder="请输入卖方电话"
           />
-        </ws-select>
-          </ws-form-item>
-          <ws-form-item
-            label="重量(吨)"
-            span="1"
-            prop="weight">
-            <ws-input
-              v-model="deptBudgetList.weight"
-              maxlength="100"
-              size="small"
-              placeholder="请输入重量(吨)"
-            />
-          </ws-form-item>
-          <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
+        </ws-form-item>
+        <!-- 验收方式 -->
+        <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
           <el-select
             v-model="deptBudgetList.acceptanceMethod"
             placeholder="请选择验收方式"
@@ -168,11 +134,7 @@
               <span class="unit-left" style="float: left">
                 <span v-if="item.flag == 'delete'"> {{ item.constValue }}</span>
                 <!-- 新增文本框 -->
-                <div
-
-                  v-if="item.flag !== 'delete'"
-                  @click.stop
-                >
+                <div v-if="item.flag !== 'delete'" @click.stop>
                   <ws-input
                     v-model="item.constValue"
                     clearable
@@ -220,102 +182,175 @@
             </el-option>
           </el-select>
         </ws-form-item>
-          <ws-form-item
-            label="溢短装(%)"
-            span="1"
-            prop="overShort">
-            <ws-input
-              v-model="deptBudgetList.overShort"
-              maxlength="100"
-              size="small"
-              placeholder="请输入溢短装比例(%)"
-            />
-          </ws-form-item>
-          <ws-form-item
-            label="交货日期(起)"
-            span="1"
-            prop="deliveryDateStart">
-         <ws-date-picker
+        <!-- 重量(吨) -->
+        <ws-form-item label="重量(吨)" span="1" prop="weight">
+          <ws-input
+            v-model="deptBudgetList.weight"
+            maxlength="100"
+            size="small"
+            placeholder="请输入重量(吨)"
+          />
+        </ws-form-item>
+        <!-- 交货日期(起) -->
+        <ws-form-item label="交货日期(起)" span="1" prop="deliveryDateStart">
+          <ws-date-picker
             v-model="deptBudgetList.deliveryDateStart"
             type="date"
             placeholder="请选择交货日期(起)"
             value-format="yyyy-MM-dd"
           />
-          </ws-form-item>
-          <ws-form-item class='readonly'
-            label="合同单价(元/吨)"
-            span="1"
-            prop="unitContractPrice"
-            >
-            <span v-if='deptBudgetList.unitContractPrice!="null"'>{{deptBudgetList.unitContractPrice}}</span>
-            
-          </ws-form-item>
-          <ws-form-item
-            label="交货日期(止)"
-            span="1"
-            prop="deliveryDateEnd">
-            <ws-date-picker
+        </ws-form-item>
+        <!-- 溢短装(%) -->
+        <ws-form-item label="溢短装(%)" span="1" prop="overShort">
+          <ws-input
+            v-model="deptBudgetList.overShort"
+            maxlength="100"
+            size="small"
+            placeholder="请输入溢短装比例(%)"
+          />
+        </ws-form-item>
+        <!-- 交货日期(止) -->
+        <ws-form-item label="交货日期(止)" span="1" prop="deliveryDateEnd">
+          <ws-date-picker
             v-model="deptBudgetList.deliveryDateEnd"
             type="date"
             placeholder="请选择交货日期(止)"
             value-format="yyyy-MM-dd"
           />
-          </ws-form-item>
-          <ws-form-item
-            label="合同总价(元)"
-            span="1"
-            prop="totalContractPrice">
-            <ws-input
+        </ws-form-item>
+        <!-- 合同单价(元/吨) -->
+        <ws-form-item
+          class="readonly"
+          label="合同单价(元/吨)"
+          span="1"
+          prop="unitContractPrice"
+        >
+          <span v-if="deptBudgetList.unitContractPrice != 'null'">{{
+            deptBudgetList.unitContractPrice
+          }}</span>
+        </ws-form-item>
+        <!-- 合同总价(元) -->
+        <ws-form-item label="合同总价(元)" span="1" prop="totalContractPrice">
+          <ws-input
             v-model="deptBudgetList.totalContractPrice"
             maxlength="100"
             placeholder="请输入合同单价"
             size="small"
           />
-          </ws-form-item>
-          <ws-form-item
-            label="签订日期"
-            span="1"
-            prop="signingDate">
-        <ws-date-picker
+        </ws-form-item>
+        <!-- 货源所在地区 -->
+        <ws-form-item label="货源所在地区" span="1" prop="packingMethod">
+            <el-cascader
+            :options="options_"
+            v-model="selectedOptions"
+            clearable
+            size="large"
+            placeholder="请选择货源所在地区"
+            style="width: 200%"
+            @change="handleChange"
+          />
+        </ws-form-item>
+        <!-- 货源详细地址 -->
+        <ws-form-item label="货源详细地址" span="1" prop="sourceGoods">
+          <ws-input
+            v-model="deptBudgetList.sourceGoods"
+            maxlength="100"
+            placeholder="请输入货源详细地址"
+            size="small"
+          />
+        </ws-form-item>
+        <!-- 交货地所在地区 -->
+        <ws-form-item label="交货地所在地区" span="1" prop="packingMethod">
+          <el-cascader
+            :options="options_"
+            v-model="selectedOptions"
+            clearable
+            size="large"
+            placeholder="请选择交货地所在地区"
+            style="width: 200%"
+            @change="handleChange"
+          />
+        </ws-form-item>
+        <!-- 交货地详细地址 -->
+        <ws-form-item label="交货地详细地址" span="1" prop="placeDelivery">
+          <ws-input
+            v-model="deptBudgetList.placeDelivery"
+            maxlength="100"
+            placeholder="请输入交货地详细地址"
+            size="small"
+          />
+        </ws-form-item>
+
+        <!-- 签订日期 -->
+        <ws-form-item label="签订日期" span="1" prop="signingDate">
+          <ws-date-picker
             v-model="deptBudgetList.signingDate"
             type="date"
             placeholder="请选择合同签订日期"
             value-format="yyyy-MM-dd"
           />
-          </ws-form-item>
-        </ws-info-table>
-      </base-card>
-      
-      <!--面试信息-->
-      <div class="remark">
-      <h3>货物信息</h3>
-    </div>
+        </ws-form-item>
+
+        <!-- 最终实际交易量(吨) -->
+        <ws-form-item
+          label="最终实际交易量(吨)"
+          span="1"
+          prop="totalContractPrice"
+        >
+          <ws-input
+            v-model="deptBudgetList.finalTradingVolume"
+            maxlength="100"
+            placeholder="请输入最终实际交易量"
+            size="small"
+          />
+        </ws-form-item>
+
+        <!-- 临时库负责人 -->
+        <ws-form-item
+          label="临时库负责人"
+          span="1"
+          prop="packingMethod"
+          v-show="deptBudgetList.sellers == '我方自提'"
+        >
+          <ws-select
+            v-model="deptBudgetList.packingMethod"
+            placeholder=""
+            class="typeselect"
+            @change="selectpackingMethod"
+          >
+            <ws-option
+              v-for="item in packtypeList"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
+            />
+          </ws-select>
+        </ws-form-item>
+      </ws-info-table>
+      <base-card>
+        <!--面试信息-->
+        <div class="remark">
+          <h3>货物信息</h3>
+        </div>
         <ws-info-table>
-          <ws-form-item class='readonly'
+          <ws-form-item
+            class="readonly"
             label="货名"
             span="1"
             prop="waterContent"
           >
-          {{deptBudgetList.contractGoodsInfo.goodsName}}
+            {{ deptBudgetList.contractGoodsInfo.goodsName }}
           </ws-form-item>
-          <ws-form-item
-            label="水分(%)<="
-            span="1"
-            prop="intendedShipId"
-          >
-          <ws-input
+          <ws-form-item label="水分(%)<=" span="1" prop="intendedShipId">
+            <ws-input
               v-model="deptBudgetList.contractGoodsInfo.waterContent"
               placeholder="请输入水分占比"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
-          <ws-form-item
-            label="品级"
-            span="1"
-            prop="grade"
-          >
-           <ws-select
+          <ws-form-item label="品级" span="1" prop="grade">
+            <ws-select
               v-model="deptBudgetList.contractGoodsInfo.grade"
               placeholder=""
               class="typeselect"
@@ -329,24 +364,16 @@
               />
             </ws-select>
           </ws-form-item>
-          <ws-form-item
-            label="杂质(%)<="
-            span="1"
-            prop="impurity"
-          >
-           <ws-input
+          <ws-form-item label="杂质(%)<=" span="1" prop="impurity">
+            <ws-input
               v-model="deptBudgetList.contractGoodsInfo.impurity"
               placeholder="请输入杂质占比(%)"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
-          <ws-form-item
-            label="容重(克/升)<="
-            span="1"
-            prop="bulkDensity"
-          >
-          <ws-input
+          <ws-form-item label="容重(克/升)<=" span="1" prop="bulkDensity">
+            <ws-input
               v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
               placeholder="请输入容重"
               maxlength="100"
@@ -359,19 +386,15 @@
             prop="mildewGrain"
             class="result"
           >
-          <ws-input
+            <ws-input
               v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
               placeholder="请输入霉变粒占比(%)"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
-           <ws-form-item
-            label="热损伤(%)<="
-            span="1"
-            prop="jiaorenli"
-          >
-          <ws-input
+          <ws-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">
+            <ws-input
               v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
               placeholder="请输入输入热损伤占比(%)"
               maxlength="100"
@@ -384,7 +407,7 @@
             prop="imperfectGrain"
             class="result"
           >
-          <ws-input
+            <ws-input
               v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
               placeholder="请输入不完整粒占比(%)"
               maxlength="100"
@@ -396,59 +419,40 @@
           <h3>流程信息</h3>
         </div>
         <ws-info-table>
-          <ws-form-item
-            label="合同收入(元)"
-            span="1"
-            prop="goodsNameKey"
-          >
-          <ws-input
+          <ws-form-item label="合同收入(元)" span="1" prop="goodsNameKey">
+            <ws-input
               v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
               placeholder="请输入合同收入(元)"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
-          <ws-form-item
-            label="已开发票(元)"
-            span="1"
-            prop="goodsName"
-          >
-          <ws-input
+          <ws-form-item label="已开发票(元)" span="1" prop="goodsName">
+            <ws-input
               v-model="deptBudgetList.contractProcessInfo.goodsName"
               placeholder="请输入已开发票(元)"
-              
               maxlength="100"
               size="small"
             />
           </ws-form-item>
-          <ws-form-item
-            label="费用支出(元)"
-            span="1"
-            prop="waterContent"
-          >
-          <ws-input
+          <ws-form-item label="费用支出(元)" span="1" prop="waterContent">
+            <ws-input
               v-model="deptBudgetList.contractProcessInfo.waterContent"
               placeholder="请输入费用支出(元)"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
-          <ws-form-item
-            label="未开发票(元)"
-            span="1"
-            prop="impurity"
-          ><ws-input
+          <ws-form-item label="未开发票(元)" span="1" prop="impurity"
+            ><ws-input
               v-model="deptBudgetList.contractProcessInfo.impurity"
               placeholder="请输入未开发票(元)"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
-          <ws-form-item
-            label="未回款(元)"
-            span="1"
-            prop="mildewGrain"
-          ><ws-input
+          <ws-form-item label="未回款(元)" span="1" prop="mildewGrain"
+            ><ws-input
               v-model="deptBudgetList.contractProcessInfo.mildewGrain"
               placeholder="请输入已完成发货量(吨)"
               maxlength="100"
@@ -461,17 +465,14 @@
             prop="imperfectGrain"
             class="result"
           >
-          <ws-input
+            <ws-input
               v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
-           <ws-form-item
-            label="双章原件回收情况"
-            span="1"
-            prop="grade"
-          ><ws-select
+          <ws-form-item label="双章原件回收情况" span="1" prop="grade"
+            ><ws-select
               v-model="deptBudgetList.contractProcessInfo.grade"
               placeholder=""
               class="typeselect"
@@ -509,18 +510,15 @@
         />
       </base-card>
     </ws-form>
-    <div style='text-align:right;padding:10px;'>
-      <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="submit()"
-          >提交</el-button
-        >
+    <div style="text-align: right; padding: 10px">
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
+        >提交</el-button
+      >
     </div>
   </div>
 </template>
 <script>
+import { regionData} from 'element-china-area-data'
 import {
   packList,
   addList,
@@ -562,6 +560,7 @@ export default {
       size: 10,
       // 提交类型
       submitType: true,
+      options_: regionData,
       tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
       ruleDeptBudget: [],
       deptBudgetList: {
@@ -719,9 +718,8 @@ export default {
     selectpackingMethod(e) {
       for (var i = 0; i < this.packtypeList.length; i++) {
         if (this.packtypeList[i].constValue == e) {
-          this.deptBudgetList.acceptanceMethodKey = this.packtypeList[
-            i
-          ].constKey
+          this.deptBudgetList.acceptanceMethodKey =
+            this.packtypeList[i].constKey
         }
       }
     },

+ 92 - 48
src/views/contractManagement/salesContractEdit.vue

@@ -74,15 +74,14 @@
             <span class="unchangeable">*</span>
           </ws-form-item>
 
-          <!--货源地-->
-          <ws-form-item label="货源地" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.sourceGoods"
-              placeholder="请输入货源地"
-              maxlength="100"
-              size="small"
-            />
+          <!--交货方式-->
+          <ws-form-item label="交货方式" span="1" prop="contractNo">
+            <div class="unchanged">
+              {{deptBudgetList.deliverType}}
+            </div>
+            <span class="unchangeable">*</span>
           </ws-form-item>
+
           <!--买方电话-->
           <ws-form-item label="买方电话" span="1" prop="contractNo">
             <ws-input
@@ -92,27 +91,6 @@
               size="small"
             />
           </ws-form-item>
-
-          <!--交货地-->
-          <ws-form-item label="交货地" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.placeDelivery"
-              placeholder="请输入交货地"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-
-          <!--卖方电话-->
-          <ws-form-item label="卖方电话" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.sellerPhone"
-              placeholder="请输入卖房电话"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-
           <!--包装方式-->
           <ws-form-item label="包装方式" span="1" prop="packingMethod">
             <ws-select
@@ -129,16 +107,15 @@
               />
             </ws-select>
           </ws-form-item>
-          <!--重量(吨)-->
-          <ws-form-item label="重量(吨)" span="1" prop="contractNo">
+          <!--卖方电话-->
+          <ws-form-item label="卖方电话" span="1" prop="contractNo">
             <ws-input
-              v-model="deptBudgetList.weight"
-              placeholder="请输入重量(吨)"
+              v-model="deptBudgetList.sellerPhone"
+              placeholder="请输入卖房电话"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
-
           <!--验收方式-->
           <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
             <el-select
@@ -211,12 +188,11 @@
               </el-option>
             </el-select>
           </ws-form-item>
-
-          <!--溢短装(%)-->
-          <ws-form-item label="溢短装(%)" span="1" prop="contractNo">
+          <!--重量(吨)-->
+          <ws-form-item label="重量(吨)" span="1" prop="contractNo">
             <ws-input
-              v-model="deptBudgetList.overShort"
-              placeholder="请输入溢短装(%)"
+              v-model="deptBudgetList.weight"
+              placeholder="请输入重量(吨)"
               maxlength="100"
               size="small"
             />
@@ -234,15 +210,15 @@
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
-
-          <!--合同单价(元/吨)-->
-          <ws-form-item label="合同单价(元/吨)" span="1" prop="contractNo">
-            <div class="unchanged">
-              {{ deptBudgetList.unitContractPrice }}
-            </div>
-            <span class="unchangeable">*</span>
+          <!--溢短装(%)-->
+          <ws-form-item label="溢短装(%)" span="1" prop="contractNo">
+            <ws-input
+              v-model="deptBudgetList.overShort"
+              placeholder="请输入溢短装(%)"
+              maxlength="100"
+              size="small"
+            />
           </ws-form-item>
-
           <!--交货日期(止)-->
           <ws-form-item label="交货日期(止)" span="1" prop="deliveryDateEnd">
             <ws-date-picker
@@ -253,6 +229,14 @@
             />
           </ws-form-item>
 
+          <!--合同单价(元/吨)-->
+          <ws-form-item label="合同单价(元/吨)" span="1" prop="contractNo">
+            <div class="unchanged">
+              {{ deptBudgetList.unitContractPrice }}
+            </div>
+            <span class="unchangeable">*</span>
+          </ws-form-item>
+
           <!--合同总价-->
           <ws-form-item label="合同总价" span="1" prop="contractNo">
             <ws-input
@@ -262,6 +246,52 @@
               size="small"
             />
           </ws-form-item>
+          <!-- 货源所在地区 -->
+          <ws-form-item label="货源所在地区" span="1" prop="packingMethod">
+           <el-cascader
+            :options="options_"
+            v-model="selectedOptions"
+            clearable
+            size="large"
+            placeholder="请选择货源所在地区"
+            style="width: 200%"
+            @change="handleChange"
+          />
+          </ws-form-item>
+          <!-- 货源详细地址 -->
+          <ws-form-item label="货源详细地址" span="1" prop="totalContractPrice">
+            <ws-input
+              v-model="deptBudgetList.totalContractPrice"
+              maxlength="100"
+              placeholder="请输入货源详细地址"
+              size="small"
+            />
+          </ws-form-item>
+          <!-- 交货地所在地区 -->
+          <ws-form-item label="交货地所在地区" span="1" prop="packingMethod">
+            <el-cascader
+            :options="options_"
+            v-model="selectedOptions"
+            clearable
+            size="large"
+            placeholder="请选择交货地所在地区"
+            style="width: 200%"
+            @change="handleChange"
+          />
+          </ws-form-item>
+          <!-- 交货地详细地址 -->
+          <ws-form-item
+            label="交货地详细地址"
+            span="1"
+            prop="totalContractPrice"
+          >
+            <ws-input
+              v-model="deptBudgetList.totalContractPrice"
+              maxlength="100"
+              placeholder="请输入交货地详细地址"
+              size="small"
+            />
+          </ws-form-item>
           <!--签订日期-->
           <ws-form-item label="签订日期" span="1" prop="signingDate">
             <ws-date-picker
@@ -271,6 +301,19 @@
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
+          <!-- 最终实际交易量(吨) -->
+          <ws-form-item
+            label="最终实际交易量(吨)"
+            span="1"
+            prop="totalContractPrice"
+          >
+            <ws-input
+              v-model="deptBudgetList.finalTradingVolume"
+              maxlength="100"
+              placeholder="请输入最终实际交易量"
+              size="small"
+            />
+          </ws-form-item>
         </ws-info-table>
       </ws-form>
     </div>
@@ -516,6 +559,7 @@
 <script>
 // import { getVesselOne } from '@/model/procurement/basic'
 // import { dayjs } from 'base-core-lib'
+import { regionData} from 'element-china-area-data'
 import WsUpload from '@/components/WsUpload'
 import {
   examineList,
@@ -554,6 +598,7 @@ export default {
       year: '',
       // 提交类型
       submitType: true,
+      options_:regionData,
       tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -1457,7 +1502,6 @@ export default {
   width: 102px;
   height: 14px;
   font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #afb5cb;
   line-height: 14px;

+ 5 - 4
src/views/tranManagement/tranManagementDriver.vue

@@ -302,7 +302,7 @@
       </div>
     </WinseaContentModal>
     <!-- 附件弹框 -->
-    <!-- <WinseaContentModal
+    <WinseaContentModal
       v-model="accessoryTFs"
       :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose"
@@ -313,14 +313,15 @@
         table-name="maintain_work_order"
         oss-key="mainPlan"
         :comp-id="compId"
+        :file-list="fileList"
         :appendix-ids="appendixIdsAdd"
         :vesselId="deptBudgetList.addressUrl"
         :size-limit="size"
         @uploadSuccess="uploadSuccess"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
       />
-    </WinseaContentModal> -->
-    <WinseaContentModal
+    </WinseaContentModal>
+    <!-- <WinseaContentModal
       v-model="accessoryTFs"
       :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose"
@@ -339,7 +340,7 @@
           </div>
         </template>
       </el-upload>
-    </WinseaContentModal>
+    </WinseaContentModal> -->
   </div>
 </template>
 <script>