暂存1

src/apis/service/sellOut/salesOrder/index.js

@@ -24,4 +24,6 @@ export default {
   saleuse: (data, params) => http(api + "saleuse", data, "post", params),
   //订单用途列表
   uselist: (data, params) => http(api + "uselist", data, "post", params),
+  //添加其他业管、PO、承诺回款时间
+  saleaddother: (data, params) => http(api + "saleaddother", data, "post", params),
 };

src/views/purchaseIn/purchaseOrder/columns.js

@@ -54,6 +54,7 @@ export default [
   {
     prop: "good_name",
     label: "商品名称",
+    _slot_: "good_name",
     'min-width': "145px",
   },
 

src/views/purchaseIn/purchaseOrder/components/ShowDataTableColumns.js

@@ -27,9 +27,9 @@ export default [
     _slot_: "supplier_name",
   },
   {
-    prop: "supplier_name1",
+    prop: "company",
     label: "购买方公司",
-    _slot_: "supplier_name1",
+    _slot_: "company",
   },
 
   {

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -41,20 +41,20 @@
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
                       <li>
-                        <span>销售方编号：</span
+                        <span>销售方公司编号：</span
                         ><span>{{ sitem.supplierNo }}</span>
                       </li>
                     </ul>
                     <i class="el-icon-warning-outline fr" slot="reference"></i>
                   </el-popover>
                 </template>
-                <template slot="supplier_name1">
-                  <span>{{ sitem.supplier_name }}</span>
+                <template slot="company">
+                  <span>{{ sitem.company }}</span>
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
                       <li>
-                        <span>销售方编号：</span
-                        ><span>{{ sitem.supplierNo }}</span>
+                        <span>购买方公司编号：</span
+                        ><span>{{ sitem.companyNo }}</span>
                       </li>
                     </ul>
                     <i class="el-icon-warning-outline fr" slot="reference"></i>

src/views/purchaseIn/purchaseOrder/index.vue

@@ -167,6 +167,14 @@
               </el-col>
             </el-row>
           </div>
+        </template>
+           <template #good_name="{ scope }">
+          <span>{{ scope.row.good_name }}</span>
+          <span v-for="(si, i) in scope.row.speclist" :key="si.spec_id + i">
+            <span v-if="i !== 0">-</span>
+            <span v-else>_</span>
+            <span>{{ si.spec_name }}[{{ si.spec_value }}]</span>
+          </span>
         </template>
         <template #status="{ scope }">
           <el-tag

src/views/purchaseIn/wsmInOrder/components/ShowDataTableColumns.js

@@ -1,8 +1,8 @@
 export default [
   {
-    prop: "wsm_supplierNo",
+    prop: "company",
     label: "购买方公司",
-    _slot_: "wsm_supplierNo",
+    _slot_: "company",
   },
   {
     prop: "wsm",

src/views/purchaseIn/wsmInOrder/detail.vue

@@ -25,6 +25,18 @@
                 :sitem="sitem"
                 :columns="ShowDataTableColumns"
               >
+                 <template slot="company">
+                  <span>{{ sitem.company }}</span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>购买方公司编号：</span
+                        ><span>{{ sitem.companyNo }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
                 <template slot="wsm">
                   <span>{{ sitem.wsm_supplier }}/{{ sitem.wsm_name }}</span>
                   <el-popover placement="top" width="300" trigger="hover">

src/views/sellOut/salesOrder/columns.js

@@ -15,6 +15,7 @@ export default [
   {
     prop: "good_name",
     label: "商品名称",
+    _slot_: "good_name",
     width: "150"
   },
   {
@@ -53,7 +54,7 @@ export default [
     width: "130px",
   },
   {
-    prop: "use_order",
+    prop: "useage",
     label: "订单用途",
     width: "100px",
   },

src/views/sellOut/salesOrder/detail.vue

@@ -20,7 +20,7 @@
           class="fr"
           type="primary"
           :size="'mini'"
-          @click="openModal()"
+          @click="setShowModel=true"
           >设置部分字段
         </el-button>
       </div>

src/views/sellOut/salesOrder/index.vue

@@ -189,6 +189,15 @@
             </el-row>
           </div>
         </template>
+        <template #good_name="{ scope }">
+          <span>{{ scope.row.good_name }}</span>
+          <span v-for="(si, i) in scope.row.speclist" :key="si.spec_id + i">
+            <span v-if="i !== 0">-</span>
+            <span v-else>_</span>
+            <span>{{ si.spec_name }}[{{ si.spec_value }}]</span>
+          </span>
+        </template>
+
         <template #status="{ scope }">
           <el-tag
             :size="tablebtnSize"

src/views/sellOut/salesOrder/setPartial.vue

@@ -20,8 +20,9 @@
             ref="ruleForm"
             :model="ruleForm"
             status-icon
+            :size="'mini'"
             :rules="rulesThis"
-            label-width="80px"
+            label-width="110px"
             class="demo-ruleForm"
           >
             <el-form-item label="承诺回款时间" prop="paytime">
@@ -53,9 +54,8 @@
           </el-form>
         </el-col>
         <el-col :span="24" style="text-align: right">
-          <span class="fl">已选{{ this.code.length }}个订单</span>
-          <el-button type="primary" @click="submitForm">保 存 </el-button>
-          <el-button @click="showModelThis = false">取 消</el-button>
+          <el-button type="primary" :size="'mini'" @click="submitForm">保 存 </el-button>
+          <el-button :size="'mini'" @click="showModelThis = false">取 消</el-button>
         </el-col>
       </el-row>
     </el-card>
@@ -141,7 +141,7 @@ export default {
         if (valid) {
           this.loading = true;
           let model = JSON.parse(JSON.stringify(this.ruleForm));
-          let res = (res = await asyncRequest.saleuse(model));
+          let res = (res = await asyncRequest.saleaddother(model));
 
           this.loading = false;
           if (res && res.code === 0) {

src/views/sellOut/salesOrder/userAddEdit.vue

@@ -45,7 +45,7 @@
           </el-form>
         </el-col>
         <el-col :span="24" style="text-align: right">
-          <span class="fl">已选{{ this.code.length }}个订单</span>
+          <span class="fl" v-if="code">已选{{ code.length }}个订单</span>
           <el-button type="primary" @click="submitForm">保 存 </el-button>
           <el-button @click="showModelThis = false">取 消</el-button>
         </el-col>