xiaodai2022 пре 2 година
родитељ
комит
175d51100c

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/0.js


+ 1 - 1
src/views/sellOut/sellOutOrder/sendOutOrder.vue

@@ -182,7 +182,7 @@ export default {
             post_fee: key["value29"],
             remark: key["value30"],
           };
-          if (!this.validateCode(key["value28"])) {
+          if (this.validateCode(key["value28"])) {
             is_codeok = false;
           }
 

+ 8 - 31
src/views/sellOut/zixunOrder/components/addEditForm.vue

@@ -110,12 +110,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="8" v-if="ruleForm.is_project === '1'">
-        <el-form-item
-          label="项目竞价截止时间"
-          class="clear"
-          required
-          label-width="140px"
-        >
+        <el-form-item label="项目竞价截止时间" class="clear" required label-width="140px">
           <el-input
             placeholder="项目竞价截止时间"
             v-model="ruleForm.pendtime"
@@ -181,9 +176,8 @@
                   :size="'mini'"
                   v-text="
                     (
-                      statusOptions.find(
-                        (item) => item.value == scope.row.good_type
-                      ) || {}
+                      statusOptions.find((item) => item.value == scope.row.good_type) ||
+                      {}
                     ).label || '--'
                   "
                 ></el-tag
@@ -215,13 +209,7 @@
       </el-col>
       <el-co :span="24">
         <el-form-item label="竞价商品要求" class="clear" required>
-          <el-table
-            :data="tableData"
-            stripe
-            border
-            :size="'mini'"
-            style="width: 100%"
-          >
+          <el-table :data="tableData" stripe border :size="'mini'" style="width: 100%">
             <el-table-column
               prop="arrival_time"
               label="到货时间"
@@ -234,12 +222,7 @@
               show-overflow-tooltip
               width="110"
             />
-            <el-table-column
-              prop="num"
-              label="购买数量"
-              show-overflow-tooltip
-              width="80"
-            >
+            <el-table-column prop="num" label="购买数量" show-overflow-tooltip width="80">
               <template slot-scope="scope">
                 <span>{{ scope.row.num }}</span
                 ><span>{{ scope.row.unit_name }}</span>
@@ -282,9 +265,7 @@
               width="170"
             >
               <template slot-scope="scope">
-                <span
-                  v-for="(si, sii) in scope.row.specinfo"
-                  :key="si.spec_name + sii"
+                <span v-for="(si, sii) in scope.row.specinfo" :key="si.spec_name + sii"
                   ><span v-if="sii !== 0">-</span>{{ si.spec_name }}:[{{
                     si.spec_value_name
                   }}]</span
@@ -358,9 +339,7 @@
         />
       </el-co>
       <el-col :span="24" style="text-align: right" v-if="id === 'add'">
-        <el-button type="primary" @click="submitForm" :size="'mini'"
-          >保 存</el-button
-        >
+        <el-button type="primary" @click="submitForm" :size="'mini'">保 存</el-button>
       </el-col>
     </el-row>
   </el-form>
@@ -612,9 +591,7 @@ export default {
             arrtime: "",
           };
           this.tableData =
-            ladder && ladder.length > 0
-              ? JSON.parse(JSON.stringify(ladder))
-              : [];
+            ladder && ladder.length > 0 ? JSON.parse(JSON.stringify(ladder)) : [];
           if (this.ruleForm.projectNo && this.ruleForm.projectNo.length === 1) {
             await this.selectChange(this.ruleForm.projectNo);
           }

+ 18 - 5
src/views/sellOut/zixunOrder/components/buyGoodModal.vue

@@ -128,11 +128,15 @@
                 </el-button>
               </el-col>
               <el-col :span="11">
-                <el-form-item label="订单备注" prop="remark" label-width="85px">
-                  <el-input
-                    v-model="ruleForm.remark"
-                    maxlength="500"
-                    placeholder="订单备注"
+                <el-form-item label="业务公司" prop="companyNo" label-width="85px">
+                  <search-work-company
+                    :value="ruleForm.companyNo"
+                    :placeholder="'业务公司'"
+                    :disabled="false"
+                    :size="'mini'"
+                    :in_company="1"
+                    :isDetail="true"
+                    @searchChange="company_idsearchChange"
                   />
                 </el-form-item>
               </el-col>
@@ -790,6 +794,15 @@ export default {
       }
     },
 
+    //销售方公司选择
+    company_idsearchChange(e) {
+      if (e) {
+        const { id, code, label } = e;
+        this.ruleForm.companyNo = code || "";
+      }
+      this.$refs.ruleForm.validateField("companyNo");
+    },
+
     closeModel() {
       console.log("closeModel!!");
       this.showModelThis = false;

Неке датотеке нису приказане због велике количине промена