zhangyuewww преди 3 години
родител
ревизия
c1673b1d90

+ 2 - 0
src/views/contractManagement/purchaseContractAdd.vue

@@ -609,6 +609,7 @@ export default {
 
       deptBudgetList: {
         deliverType: '1',
+        addressUrl:'',
         finalTradingVolume: 0,
         totalContractPrice:0,
         contractGoodsInfo: {
@@ -1344,6 +1345,7 @@ export default {
                   goodsName: '',
                 },
                 contractProcessInfo: {},
+                addressUrl:'',
               }
               this.$router.push({ path: 'buyContract' })
             })

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

@@ -425,7 +425,7 @@
 
         <ws-info-table>
           <!--合同收入(元)-->
-          <ws-form-item label="合同收入(元)" span="1" prop="contractNo">
+          <ws-form-item label="合同收入(元)" span="1" prop="goodsNameKey">
             <ws-input
               v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
               placeholder="请输入合同收入(元)"

+ 10 - 21
src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -67,22 +67,14 @@
               :value="item.constValue"
             />
             {{dataList.inOutType}}
-            <!-- </el-select> -->
           </el-form-item>
           <!-- 合同编号 -->
-          <el-form-item label="合同编号">
-            <!-- <el-option
-              v-for="item in contractNoList"
-              :key="item.constKey"
-              :label="item.contractNo"
-              :value="item.contractNo"
-            ></el-option> -->
-            
-            {{dataList.moveTaskNo}}
-            {{dataList.contractNo}}
-            <div v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">  {{dataList.moveTaskNo}}</div>
+          <el-form-item label="移库任务编号" v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">
+            <div>  {{dataList.moveTaskNo}}</div>
             <div v-if="dataList.inOutType != '移库入库' || dataList.inOutType != '移库出库'">  {{dataList.contractNo}}</div>
-            <!-- </el-select> -->
+          </el-form-item>
+           <el-form-item label="合同编号" v-else>
+            <div>  {{dataList.contractNo}}</div>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
@@ -183,15 +175,12 @@
             <!-- </el-select> -->
           </el-form-item>
           <!-- 合同编号 -->
-          <el-form-item label="合同编号">
-            <!-- <el-option
-              v-for="item in contractNoList"
-              :key="item.constKey"
-              :label="item.contractNo"
-              :value="item.contractNo"
-            ></el-option> -->
-               <div v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">  {{dataList.moveTaskNo}}</div>
+           <el-form-item label="移库任务编号" v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">
+            <div>  {{dataList.moveTaskNo}}</div>
             <div v-if="dataList.inOutType != '移库入库' || dataList.inOutType != '移库出库'">  {{dataList.contractNo}}</div>
+          </el-form-item>
+           <el-form-item label="合同编号" v-else>
+            <div>  {{dataList.contractNo}}</div>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">