Procházet zdrojové kódy

修改 切合同地址没带过来问题,添加红色星号

mxx před 3 roky
rodič
revize
8ea2c74210

+ 6 - 5
src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -15,7 +15,7 @@
       <div class="remark">
         <h3>基本信息</h3>
         <p style="color: #8890b1">
-          注:基本信息和货物信息均为必填项,“*” 标记的条目提交后不可修改。
+          注:基本信息和货物信息均为必填项,“<span style="color:red">*</span>” 标记的条目提交后不可修改。
         </p>
       </div>
       <ws-info-table>
@@ -185,7 +185,7 @@
         <!--临时仓库负责人-->
         <ws-form-item v-show="deptBudgetList.deliverType == 1" label="临时仓库负责人" span="1" prop="packingMethod">
           <el-select v-model="deptBudgetList.personCharge" placeholder="请选择临时仓库负责人" filterable clearable
-             @change="selectstaff">
+            @change="selectstaff">
             <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
           </el-select>
         </ws-form-item>
@@ -1884,7 +1884,8 @@
     width: 100%;
     text-align: left;
   }
-   .inline-input {
-      width: 100%;
-    }
+
+  .inline-input {
+    width: 100%;
+  }
 </style>

+ 1 - 1
src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -30,7 +30,7 @@
       <div class="remark">
         <h3>基本信息</h3>
         <p style="color: #8890b1">
-          &nbsp;&nbsp;注:基本信息和货物信息均为必填项,“*”
+          &nbsp;&nbsp;注:基本信息和货物信息均为必填项,“<span style="color:red">*</span>
           标记的条目提交后不可修改。
         </p>
         <div class="queren">

+ 1 - 1
src/views/contractManagement/futuresSalesContractAdd.vue

@@ -15,7 +15,7 @@
       <div class="remark">
         <h3>基本信息</h3>
         <p style="color: #8890b1">
-          注:基本信息和货物信息均为必填项,“*” 标记的条目提交后不可修改。
+          注:基本信息和货物信息均为必填项,“<span style="color:red">*</span>” 标记的条目提交后不可修改。
         </p>
       </div>
       <ws-info-table>

+ 1 - 1
src/views/contractManagement/futuresSalesContractEdit.vue

@@ -16,7 +16,7 @@
       <div class="remark">
         <h3>基本信息</h3>
         <p style="color: #8890b1">
-          &nbsp;&nbsp;注:基本信息和货物信息均为必填项,“*”
+          &nbsp;&nbsp;注:基本信息和货物信息均为必填项,“<span style="color:red">*</span>
           标记的条目提交后不可修改。
         </p>
         <div class="queren">

+ 5 - 1
src/views/contractManagement/purchaseContractAdd.vue

@@ -14,7 +14,7 @@
       <div class="remark">
         <h3>基本信息</h3>
         <p style="color: #8890b1">
-          注:基本信息和货物信息均为必填项,“*” 标记的条目提交后不可修改。
+          注:基本信息和货物信息均为必填项,“<span style="color:red">*</span>” 标记的条目提交后不可修改。
         </p>
       </div>
       <ws-info-table>
@@ -684,6 +684,10 @@
             this.deptBudgetList.agreementNo = this.contractNoList[i].contractNo
             this.deptBudgetList.contractNo = this.contractNoList[i].contractNo
             this.deptBudgetList.agreementType = '补充协议'
+            this.newSelectedOptions = this.contractNoList[i].sourceProvince+this.contractNoList[i].sourceCity+this.contractNoList[i].sourceArea
+            this.deptBudgetList.sourceGoods =  this.contractNoList[i].sourceGoods
+            this.newSelectedOptions1 = this.contractNoList[i].deliveryProvince+this.contractNoList[i].deliveryCity+this.contractNoList[i].deliveryArea
+            this.deptBudgetList.placeDelivery =  this.contractNoList[i].placeDelivery
           }
         }
       },

+ 33 - 29
src/views/contractManagement/purchaseContractEdit.vue

@@ -16,7 +16,7 @@
       <div class="remark">
         <h3>基本信息</h3>
         <p style="color: #8890b1">
-          &nbsp;&nbsp;注:基本信息和货物信息均为必填项,“*”
+          &nbsp;&nbsp;注:基本信息和货物信息均为必填项,“<span style="color:red">*</span>
           标记的条目提交后不可修改。
         </p>
       </div>
@@ -462,35 +462,39 @@
             if (response.unitContractPrice) {
               response.unitContractPrice = String(response.unitContractPrice)
             }
-            var tmp = []
-            tmp[0] = TextToCode[response.sourceProvince].code
-
-            tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
-
-            if (tmp[0] == 810000 || tmp[0] == 820000) {
-              tmp[2] = null
-            } else {
-              tmp[2] =
-                TextToCode[response.sourceProvince][response.sourceCity][
-                  response.sourceArea
-                ].code
-            }
-            this.selectedOptions = tmp
-            var tmp1 = []
-            tmp1[0] = TextToCode[response.deliveryProvince].code
-            tmp1[1] =
-              TextToCode[response.deliveryProvince][response.deliveryCity].code
-
-            if (tmp1[0] == 810000 || tmp1[0] == 820000) {
-              tmp1[2] = null
-            } else {
-              tmp1[2] =
-                TextToCode[response.deliveryProvince][response.deliveryCity][
-                  response.deliveryArea
-                ].code
-            }
-            this.selectedOptions1 = tmp1
+            // var tmp = []
+            // tmp[0] = TextToCode[response.sourceProvince].code
+
+            // tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
+
+            // if (tmp[0] == 810000 || tmp[0] == 820000) {
+            //   tmp[2] = null
+            // } else {
+            //   tmp[2] =
+            //     TextToCode[response.sourceProvince][response.sourceCity][
+            //       response.sourceArea
+            //     ].code
+            // }
+            // this.selectedOptions = tmp
+            // var tmp1 = []
+            // tmp1[0] = TextToCode[response.deliveryProvince].code
+            // tmp1[1] =
+            //   TextToCode[response.deliveryProvince][response.deliveryCity].code
+
+            // if (tmp1[0] == 810000 || tmp1[0] == 820000) {
+            //   tmp1[2] = null
+            // } else {
+            //   tmp1[2] =
+            //     TextToCode[response.deliveryProvince][response.deliveryCity][
+            //       response.deliveryArea
+            //     ].code
+            // }
+            // this.selectedOptions1 = tmp1
             this.deptBudgetList = response
+           this.newSelectedOptions = response.sourceProvince+response.sourceCity+response.sourceArea
+           this.deptBudgetList.sourceGoods =  response.sourceGoods
+           this.newSelectedOptions1 = response.deliveryProvince+response.deliveryCity+response.deliveryArea
+           this.deptBudgetList.placeDelivery =  response.placeDelivery
             if (this.deptBudgetList.deliverType == 1) {
               this.deptBudgetList.deliverType1 = '我方自提'
             } else if (this.deptBudgetList.deliverType == 2) {

+ 11 - 8
src/views/contractManagement/salesContractAdd.vue

@@ -10,16 +10,15 @@
         </el-button>
       </el-col>
     </el-row>
-
-    <div class="wenzi">
-      <h3>基本信息</h3>
-      <p>
-        &nbsp;&nbsp;注:基本信息和货物信息均为必填项,“*”
-        标记的条目提交后不可修改。
-      </p>
-    </div>
     <div class="center">
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
+      <div class="remark">
+        <h3>基本信息</h3>
+        <p style="color: #8890b1">
+            &nbsp;&nbsp;注:基本信息和货物信息均为必填项,“<span style="color:red">*</span>”
+            标记的条目提交后不可修改。
+          </p>
+      </div>
         <!--基本信息-->
         <ws-info-table>
           <!--合同类型-->
@@ -621,6 +620,10 @@
             this.deptBudgetList.agreementNo = this.contractNoList[i].contractNo
             this.deptBudgetList.contractNo = this.contractNoList[i].contractNo
             this.deptBudgetList.agreementType = '补充协议'
+            this.newSelectedOptions = this.contractNoList[i].sourceProvince+this.contractNoList[i].sourceCity+this.contractNoList[i].sourceArea
+            this.deptBudgetList.sourceGoods =  this.contractNoList[i].sourceGoods
+            this.newSelectedOptions1 = this.contractNoList[i].deliveryProvince+this.contractNoList[i].deliveryCity+this.contractNoList[i].deliveryArea
+            this.deptBudgetList.placeDelivery =  this.contractNoList[i].placeDelivery
           }
         }
       },

+ 7 - 8
src/views/contractManagement/salesContractEdit.vue

@@ -10,16 +10,15 @@
         </el-button>
       </el-col>
     </el-row>
-
-    <div class="wenzi">
-      <h3>基本信息</h3>
-      <p>
-        &nbsp;&nbsp;注:基本信息和货物信息均为必填项,“*”
-        标记的条目提交后不可修改。
-      </p>
-    </div>
     <div class="center">
       <ws-form ref="deptBudgetList" :rules="ruleDeptBudget" :model="deptBudgetList">
+         <div class="remark">
+      <h3>基本信息</h3>
+      <p style="color: #8890b1">
+          &nbsp;&nbsp;注:基本信息和货物信息均为必填项,“<span style="color:red">*</span>”
+          标记的条目提交后不可修改。
+        </p>
+    </div>
         <!--基本信息-->
         <ws-info-table>
           <!--合同类型-->