轮胎商城附件上传和删除

src/api/tirePartsMall/salesManagement/saleOrder.js

@@ -58,7 +58,7 @@ export const delOrderItem = (data) => {
     params: data
   })
 }
-//申请退款 
+//申请退款
 export const checkOrder = (data) => {
   return request({
     url: '/api/blade-sales-part/order/checkOrder',
@@ -150,6 +150,14 @@ export const getKh = () => {
     method: 'get',
   })
 }
+// 收款结算里的查询客户
+export const skgetKh = () => {
+  return request({
+    url: '/api/blade-sales-part/corpsDesc/listAll?cname=&corpType=KH&enableOrNot=1',
+    method: 'get',
+  })
+}
+
 //收款账户下拉
 export const getSk = () => {
   return request({

src/api/user.js

@@ -100,3 +100,10 @@ export const sharedDeletion = (url,id) => request({
     ids:id
   }
 });
+
+// 轮胎商城的附件删除
+export const LTfujianDelete = (params) => request({
+  url: '/api/blade-sales-part/files/remove',
+  method: 'post',
+  params: params
+});

src/components/upload/index.vue

@@ -249,7 +249,7 @@
 
 <script>
 import { getToken } from "@/util/auth";
-import { sharedDeletion } from "@/api/user";
+import {LTfujianDelete, sharedDeletion} from "@/api/user";
 import option from "@/views/exportTrade/customerInquiry/config/mainList.json";
 import { gainUser } from "@/api/basicData/customerInquiry";
 import { updateListRemove } from "@/api/uploadFile/upload-file";
@@ -580,6 +580,13 @@ export default {
                 this.data.splice(index, 1);
               }
             });
+          }else if (this.typeUpload == "LT") {
+              LTfujianDelete({ids:row.id}).then(res=>{
+                  if (res.data.success) {
+                      this.$message.success("操作成功!");
+                      this.data.splice(index, 1);
+                  }
+              })
           } else {
             sharedDeletion(this.deleteUrl, row.id).then(res => {
               if (res.data.success) {

src/views/businessManagement/deliveryNotice/configuration/mainList.json

@@ -236,7 +236,7 @@
       "overHidden": true
     },{
       "label": "是否生成凭证",
-      "prop": "generate",
+      "prop": "voucherStatus",
       "search": true,
       "type":"select",
       "dicData": [

src/views/businessManagement/receipt/configuration/mainList.json

@@ -250,6 +250,24 @@
       "index": 21,
       "width": 100,
       "overHidden": true
+    },
+    {
+      "label": "是否能生成凭证",
+      "prop": "voucherStatus",
+      "search": true,
+      "type": "select",
+      "dicData": [
+        {
+          "label": "未生成",
+          "value": 0
+        },{
+          "label": "已生成",
+          "value": 1
+        }
+      ],
+      "index": 22,
+      "width": 100,
+      "overHidden": true
     }
   ]
 }

src/views/businessManagement/receipt/index.vue

@@ -50,6 +50,9 @@
         <template slot-scope="scope" slot="createUser">
           {{ scope.row.createUserName }}
         </template>
+          <template slot-scope="scope" slot="voucherStatus">
+              {{ scope.row.voucherStatus==0?'未生成':'已生成' }}
+          </template>
         <template slot-scope="scope" slot="menu">
           <!--          <el-button-->
           <!--            type="text"-->

src/views/productionManagement/index.vue

@@ -30,6 +30,7 @@
                     <div class="renlitext">人力资源部</div>
                     <!--深蓝色-->
                     <div class="staffBox">
+                        <div class="zhunbedate">15分</div>
                         <div class="staffBoxren">
                             <span class="staffBoxtext">{{DarkBlueStaff.postName}}</span>
                             <span class="zhuangtai">{{EmployeeStatusfun(DarkBlueStaff.currentState)}}</span>
@@ -50,6 +51,7 @@
                     </div>
                     <!--绿色-->
                     <div class="staffBox staffBoxflex">
+                        <div class="zhunbedate">120分</div>
                         <div class="staffBoxren">
                             <span class="staffBoxtext">{{GreenStaff1.postName}}</span>
                             <span class="zhuangtai">{{EmployeeStatusfun(GreenStaff1.currentState)}}</span>
@@ -87,6 +89,7 @@
                     </div>
                     <!--褐色-->
                     <div class="staffBox">
+                        <div class="zhunbedate">0分</div>
                         <div class="staffBoxren">
                             <span class="staffBoxtext">{{BrownStaff.postName}}</span>
                             <span class="zhuangtai">{{EmployeeStatusfun(BrownStaff.currentState)}}</span>
@@ -107,6 +110,7 @@
                     </div>
                     <!--蓝色-->
                     <div class="staffBox staffBoxflex">
+                        <div class="zhunbedate">60分</div>
                         <div class="staffBoxren">
                             <span class="staffBoxtext">{{BlueStaff1.postName}}</span>
                             <span class="zhuangtai">{{EmployeeStatusfun(BlueStaff1.currentState)}}</span>
@@ -144,6 +148,7 @@
                     </div>
                     <!--紫色-->
                     <div class="staffBox staffBoxflex">
+                        <div class="zhunbedate">30分</div>
                         <div class="staffBoxren">
                             <span class="staffBoxtext">{{PurpleStaff1.postName}}</span>
                             <span class="zhuangtai">{{EmployeeStatusfun(PurpleStaff1.currentState)}}</span>
@@ -885,471 +890,6 @@
             </div>
         </div>
 
-
-        <div>
-            <!--<div style="position: fixed;bottom: 20%">-->
-            <!--    <div @click="kaishi">开始</div>-->
-            <!--    <div @click="stopfun">暂停</div>-->
-            <!--    <div @click="jiakuai">时间倍速加快{{DoubleSpeed}}</div>-->
-            <!--    <div @click="jianman">时间倍速减{{DoubleSpeed}}</div>-->
-            <!--    <div>{{formatdate}}</div>-->
-            <!--    <div>当前天数{{CurrentDays}}</div>-->
-            <!--    <div>在跑时间：{{totalTime}}</div>-->
-            <!--    <div>花费原材料的钱{{rawMaterialSpendCash}}</div>-->
-            <!--    <div>现金：{{TotalMoney}}</div>-->
-            <!--</div>-->
-            <!--<div style="display: flex;width: 90%;margin: 0 auto">-->
-            <!--    <div class="leftbox">-->
-            <!--        <div style="width: 50px;height: 50px;background: blue;color: #fff">-->
-            <!--            <SelectOption :OptionalPost="DarkBlueOptionalPost" @DropDownfun="DropDownfun($event,'深蓝色')">-->
-            <!--                {{DarkBlueStaff.postName}}-->
-            <!--            </SelectOption>-->
-            <!--            <div>{{EmployeeStatusfun(DarkBlueStaff.currentState)}}</div>-->
-            <!--        </div>-->
-            <!--        <div style="display: flex;">-->
-            <!--            <div style="width: 50px;height: 50px;background: #7efc26;color: #000">-->
-            <!--                <SelectOption :OptionalPost="GreenOptionalPost" @DropDownfun="DropDownfun($event,'绿色',GreenStaff2,GreenStaff1)">-->
-            <!--                    {{GreenStaff1.postName}}-->
-            <!--                </SelectOption>-->
-            <!--                <div>{{EmployeeStatusfun(GreenStaff1.currentState)}}</div>-->
-            <!--            </div>-->
-            <!--            <div style="width: 50px;height: 50px;background: #7efc26;color: #000">-->
-            <!--                <SelectOption :OptionalPost="GreenOptionalPost" @DropDownfun="DropDownfun($event,'绿色',GreenStaff1,GreenStaff2)">-->
-            <!--                    {{GreenStaff2.postName}}-->
-            <!--                </SelectOption>-->
-            <!--                <div>{{EmployeeStatusfun(GreenStaff2.currentState)}}</div>-->
-            <!--            </div>-->
-            <!--        </div>-->
-            <!--        <div style="width: 50px;height: 50px;background: #a87718;color: #000">-->
-            <!--            <SelectOption :OptionalPost="BrownOptionalPost" @DropDownfun="DropDownfun($event,'褐色')">-->
-            <!--                {{BrownStaff.postName}}-->
-            <!--            </SelectOption>-->
-            <!--            <div>{{EmployeeStatusfun(BrownStaff.currentState)}}</div>-->
-            <!--        </div>-->
-            <!--        <div style="display: flex">-->
-            <!--            <div style="width: 50px;height: 50px;background: #7efefe;color: #000">-->
-            <!--                <SelectOption :OptionalPost="BlueOptionalPost" @DropDownfun="DropDownfun($event,'蓝色',BlueStaff2,BlueStaff1)">-->
-            <!--                    {{BlueStaff1.postName}}-->
-            <!--                </SelectOption>-->
-            <!--                <div>{{EmployeeStatusfun(BlueStaff1.currentState)}}</div>-->
-            <!--            </div>-->
-            <!--            <div style="width: 50px;height: 50px;background: #7efefe;color: #000">-->
-            <!--                <SelectOption :OptionalPost="BlueOptionalPost" @DropDownfun="DropDownfun($event,'蓝色',BlueStaff1,BlueStaff2)">-->
-            <!--                    {{BlueStaff2.postName}}-->
-            <!--                </SelectOption>-->
-            <!--                <div>{{EmployeeStatusfun(BlueStaff2.currentState)}}</div>-->
-            <!--            </div>-->
-            <!--        </div>-->
-            <!--        <div style="display: flex">-->
-            <!--            <div style="width: 50px;height: 50px;background: #dc23fc;color: #000">-->
-            <!--                <SelectOption :OptionalPost="PurpleOptionalPost" @DropDownfun="DropDownfun($event,'紫色',PurpleStaff2,PurpleStaff1)">-->
-            <!--                    {{PurpleStaff1.postName}}-->
-            <!--                </SelectOption>-->
-            <!--                <div>{{EmployeeStatusfun(PurpleStaff1.currentState)}}</div>-->
-            <!--            </div>-->
-            <!--            <div style="width: 50px;height: 50px;background: #dc23fc;color: #000">-->
-            <!--                <SelectOption :OptionalPost="PurpleOptionalPost" @DropDownfun="DropDownfun($event,'紫色',PurpleStaff1,PurpleStaff2)">-->
-            <!--                    {{PurpleStaff2.postName}}-->
-            <!--                </SelectOption>-->
-            <!--                <div>{{EmployeeStatusfun(PurpleStaff2.currentState)}}</div>-->
-            <!--            </div>-->
-            <!--        </div>-->
-            <!--    </div>-->
-
-            <!--    <div class="rightbox">-->
-            <!--        &lt;!&ndash;10&ndash;&gt;-->
-            <!--        <el-row type="flex" justify="center">-->
-            <!--            <el-col :span="1"><div style="display: flex;align-items: center;">需求</div></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div>需要数量{{demand1.TotalProduction}}</div>-->
-            <!--                <div>生产数量{{demand1.produced}}</div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div>需要数量{{demand2.TotalProduction}}</div>-->
-            <!--                <div>生产数量{{demand2.produced}}</div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div>需要数量{{demand3.TotalProduction}}</div>-->
-            <!--                <div>生产数量{{demand3.produced}}</div>-->
-            <!--            </el-col>-->
-            <!--        </el-row>-->
-            <!--        &lt;!&ndash;9&ndash;&gt;-->
-            <!--        <el-row type="flex" justify="center">-->
-            <!--            <el-col :span="1"><div style="display: flex;align-items: center;height: 100%">9</div></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ A9Obj.color" @click="xianchanfun('A9')">-->
-            <!--                    <div>A9</div>-->
-            <!--                    <div>是否限产{{A9Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{A9Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{A9Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{A9Obj.date}}</div>-->
-            <!--                    <div>卖出的价格{{A9Obj.SellingPrice}}</div>-->
-            <!--                    <div>准备时间{{A9Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{A9Obj.RunningTime}}</div>-->
-            <!--                    <div>单价{{A9Obj.unitPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ D9Obj.color" @click="xianchanfun('D9')">-->
-            <!--                    <div>D9</div>-->
-            <!--                    <div>是否限产{{D9Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{D9Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{D9Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{D9Obj.date}}</div>-->
-            <!--                    <div>卖出的价格{{D9Obj.SellingPrice}}</div>-->
-            <!--                    <div>准备时间{{D9Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{D9Obj.RunningTime}}</div>-->
-            <!--                    <div>单价{{D9Obj.unitPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ F9Obj.color" @click="xianchanfun('F9')">-->
-            <!--                    <div>F9</div>-->
-            <!--                    <div>是否限产{{F9Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{F9Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{F9Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{F9Obj.date}}</div>-->
-            <!--                    <div>卖出的价格{{F9Obj.SellingPrice}}</div>-->
-            <!--                    <div>准备时间{{F9Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{F9Obj.RunningTime}}</div>-->
-            <!--                    <div>单价{{F9Obj.unitPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--        </el-row>-->
-            <!--        &lt;!&ndash;8&ndash;&gt;-->
-            <!--        <el-row type="flex" justify="center">-->
-            <!--            <el-col :span="1"><div style="display: flex;align-items: center;height: 100%;min-height: 60px;">8</div></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div id="sizeid" style="width: 100%;">-->
-            <!--                    <canvas id="canvasIdA8"></canvas>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div id="sizeid" style="width: 100%;">-->
-            <!--                    <canvas id="canvasIdD8"></canvas>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div id="sizeid" style="width: 100%;">-->
-            <!--                    <canvas id="canvasIdF8"></canvas>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--        </el-row>-->
-            <!--        &lt;!&ndash;7&ndash;&gt;-->
-            <!--        <el-row type="flex" justify="center">-->
-            <!--            <el-col :span="1"><div style="display: flex;align-items: center;height: 100%">7</div></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ A7Obj.color" @click="xianchanfun('A7')">-->
-            <!--                    <div>A7</div>-->
-            <!--                    <div>是否限产{{A7Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{A7Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{A7Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{A7Obj.date}}</div>-->
-            <!--                    <div>准备时间{{A7Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{A7Obj.RunningTime}}</div>-->
-            <!--                    <div>单价{{A7Obj.unitPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ D7Obj.color" @click="xianchanfun('D7')">-->
-            <!--                    <div>D7</div>-->
-            <!--                    <div>是否限产{{D7Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{D7Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{D7Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{D7Obj.date}}</div>-->
-            <!--                    <div>准备时间{{D7Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{D7Obj.RunningTime}}</div>-->
-            <!--                    <div>单价{{D7Obj.unitPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ F7Obj.color" @click="xianchanfun('F7')">-->
-            <!--                    <div>F7</div>-->
-            <!--                    <div>是否限产{{F7Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{F7Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{F7Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{F7Obj.date}}</div>-->
-            <!--                    <div>准备时间{{F7Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{F7Obj.RunningTime}}</div>-->
-            <!--                    <div>单价{{F7Obj.unitPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--        </el-row>-->
-            <!--        &lt;!&ndash;6&ndash;&gt;-->
-            <!--        <el-row type="flex" justify="center">-->
-            <!--            <el-col :span="1"><div style="display: flex;align-items: center;height: 100%">6</div></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ A6Obj.color" @click="xianchanfun('A6')">-->
-            <!--                    <div>A6</div>-->
-            <!--                    <div>是否限产{{A6Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{A6Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{A6Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{A6Obj.date}}</div>-->
-            <!--                    <div>准备时间{{A6Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{A6Obj.RunningTime}}</div>-->
-            <!--                    <div>单价{{A6Obj.unitPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div id="sizeid" style="width: 100%;">-->
-            <!--                    <canvas id="canvasIdC6"></canvas>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div id="sizeid" style="width: 100%;">-->
-            <!--                    <canvas id="canvasIdE6"></canvas>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div id="sizeid" style="width: 100%;">-->
-            <!--                    <canvas id="canvasIdF6"></canvas>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--        </el-row>-->
-            <!--        &lt;!&ndash;5&ndash;&gt;-->
-            <!--        <el-row type="flex" justify="center">-->
-            <!--            <el-col :span="1"><div style="display: flex;align-items: center;height: 100%">5</div></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ A5Obj.color" @click="xianchanfun('A5')">-->
-            <!--                    <div>A5</div>-->
-            <!--                    <div>是否限产{{A5Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{A5Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{A5Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{A5Obj.date}}</div>-->
-            <!--                    <div>准备时间{{A5Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{A5Obj.RunningTime}}</div>-->
-            <!--                    <div>单价{{A5Obj.unitPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ C5Obj.color" @click="xianchanfun('C5')">-->
-            <!--                    <div>C5</div>-->
-            <!--                    <div>是否限产{{C5Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{C5Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{C5Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{C5Obj.date}}</div>-->
-            <!--                    <div>准备时间{{C5Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{C5Obj.RunningTime}}</div>-->
-            <!--                    <div>单价{{C5Obj.unitPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ E5Obj.color" @click="xianchanfun('E5')">-->
-            <!--                    <div>E5</div>-->
-            <!--                    <div>是否限产{{E5Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{E5Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{E5Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{E5Obj.date}}</div>-->
-            <!--                    <div>准备时间{{E5Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{E5Obj.RunningTime}}</div>-->
-            <!--                    <div>单价{{E5Obj.unitPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ F5Obj.color" @click="xianchanfun('F5')">-->
-            <!--                    <div>F5</div>-->
-            <!--                    <div>是否限产{{F5Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{F5Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{F5Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{F5Obj.date}}</div>-->
-            <!--                    <div>准备时间{{F5Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{F5Obj.RunningTime}}</div>-->
-            <!--                    <div>单价{{F5Obj.unitPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--        </el-row>-->
-            <!--        &lt;!&ndash;4&ndash;&gt;-->
-            <!--        <el-row type="flex" justify="center">-->
-            <!--            <el-col :span="1"><div style="display: flex;align-items: center;height: 100%;min-height: 60px;">4</div></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div id="sizeid" style="width: 100%;">-->
-            <!--                    <canvas id="canvasIdA4"></canvas>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div id="sizeid" style="width: 100%;">-->
-            <!--                    <canvas id="canvasIdC4"></canvas>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div id="sizeid" style="width: 100%;">-->
-            <!--                    <canvas id="canvasIdE4"></canvas>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div id="sizeid" style="width: 100%;">-->
-            <!--                    <canvas id="canvasIdF4"></canvas>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--        </el-row>-->
-            <!--        &lt;!&ndash;3&ndash;&gt;-->
-            <!--        <el-row type="flex" justify="center">-->
-            <!--            <el-col :span="1"><div style="display: flex;align-items: center;height: 100%">3</div></el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ B3Obj.color" @click="xianchanfun('B3')">-->
-            <!--                    <div>B3</div>-->
-            <!--                    <div>是否限产{{B3Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{B3Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{B3Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{B3Obj.date}}</div>-->
-            <!--                    <div>准备时间{{B3Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{B3Obj.RunningTime}}</div>-->
-            <!--                    <div>单价{{B3Obj.unitPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div id="sizeid" style="width: 100%;">-->
-            <!--                    <canvas id="canvasIdE3"></canvas>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ F3Obj.color" @click="xianchanfun('F3')">-->
-            <!--                    <div>F3</div>-->
-            <!--                    <div>是否限产{{F3Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{F3Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{F3Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{F3Obj.date}}</div>-->
-            <!--                    <div>准备时间{{F3Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{F3Obj.RunningTime}}</div>-->
-            <!--                    <div>单价{{F3Obj.unitPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--        </el-row>-->
-            <!--        &lt;!&ndash;2&ndash;&gt;-->
-            <!--        <el-row type="flex" justify="center">-->
-            <!--            <el-col :span="1"><div style="display: flex;align-items: center;height: 100%">2</div></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div id="sizeid" style="width: 100%;">-->
-            <!--                    <canvas id="canvasIdA2"></canvas>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div id="sizeid" style="width: 100%;">-->
-            <!--                    <canvas id="canvasIdC2"></canvas>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ E2Obj.color" @click="xianchanfun('E2')">-->
-            <!--                    <div>E2</div>-->
-            <!--                    <div>是否限产{{E2Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{E2Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{E2Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{E2Obj.date}}</div>-->
-            <!--                    <div>准备时间{{E2Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{E2Obj.RunningTime}}</div>-->
-            <!--                    <div>单价{{E2Obj.unitPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ F2Obj.color"  @click="xianchanfun('F2')">-->
-            <!--                    <div>F2</div>-->
-            <!--                    <div>是否限产{{F2Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{F2Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{F2Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{F2Obj.date}}</div>-->
-            <!--                    <div>准备时间{{F2Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{F2Obj.RunningTime}}</div>-->
-            <!--                    <div>单价{{F2Obj.unitPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--        </el-row>-->
-            <!--        &lt;!&ndash;1&ndash;&gt;-->
-            <!--        <el-row type="flex" justify="center">-->
-            <!--            <el-col :span="1"><div style="display: flex;align-items: center;height: 100%">1</div></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ A1Obj.color" @click="xianchanfun('A1')">-->
-            <!--                    <div>A1</div>-->
-            <!--                    <div>是否限产{{A1Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{A1Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{A1Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{A1Obj.date}}</div>-->
-            <!--                    <div>准备时间{{A1Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{A1Obj.RunningTime}}</div>-->
-            <!--                    <div @click.stop="rawMaterialTruefun('A1')">原材料数量{{A1Obj.RawMaterialNumber}}</div>-->
-            <!--                    <div>原材料价格{{A1Obj.RawMaterialPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ C1Obj.color" @click="xianchanfun('C1')">-->
-            <!--                    <div>C1</div>-->
-            <!--                    <div>是否限产{{C1Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{C1Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{C1Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{C1Obj.date}}</div>-->
-            <!--                    <div>准备时间{{C1Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{C1Obj.RunningTime}}</div>-->
-            <!--                    <div @click.stop="rawMaterialTruefun('C1')">原材料数量{{C1Obj.RawMaterialNumber}}</div>-->
-            <!--                    <div>原材料价格{{C1Obj.RawMaterialPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3"></el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ E1Obj.color"  @click="xianchanfun('E1')">-->
-            <!--                    <div>E1</div>-->
-            <!--                    <div>是否限产{{E1Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{E1Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{E1Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{E1Obj.date}}</div>-->
-            <!--                    <div>准备时间{{E1Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{E1Obj.RunningTime}}</div>-->
-            <!--                    <div @click.stop="rawMaterialTruefun('E1')">原材料数量{{E1Obj.RawMaterialNumber}}</div>-->
-            <!--                    <div>原材料价格{{E1Obj.RawMaterialPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--            <el-col :span="3">-->
-            <!--                <div class="xiaohezi" :style="'background:'+ F1Obj.color"  @click="xianchanfun('F1')">-->
-            <!--                    <div>F1</div>-->
-            <!--                    <div>是否限产{{F1Obj.ProductionRestriction}}</div>-->
-            <!--                    <div>限产数量{{F1Obj.LimitedProductionQuantity}}</div>-->
-            <!--                    <div>库存{{F1Obj.inventory}}</div>-->
-            <!--                    <div>生产时间{{F1Obj.date}}</div>-->
-            <!--                    <div>准备时间{{F1Obj.PreparationTime}}</div>-->
-            <!--                    <div>在跑时间{{F1Obj.RunningTime}}</div>-->
-            <!--                    <div @click.stop="rawMaterialTruefun('F1')">原材料数量{{F1Obj.RawMaterialNumber}}</div>-->
-            <!--                    <div>原材料价格{{F1Obj.RawMaterialPrice}}</div>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-            <!--        </el-row>-->
-            <!--        &lt;!&ndash;0&ndash;&gt;-->
-            <!--        <el-row type="flex" justify="center">-->
-            <!--            <el-col :span="1"><div style="text-align: center"></div></el-col>-->
-            <!--            <el-col :span="3"><div style="text-align: center">A</div></el-col>-->
-            <!--            <el-col :span="3"><div style="text-align: center">B</div></el-col>-->
-            <!--            <el-col :span="3"><div style="text-align: center">C</div></el-col>-->
-            <!--            <el-col :span="3"><div style="text-align: center">D</div></el-col>-->
-            <!--            <el-col :span="3"><div style="text-align: center">E</div></el-col>-->
-            <!--            <el-col :span="3"><div style="text-align: center">F</div></el-col>-->
-            <!--        </el-row>-->
-
-            <!--    </div>-->
-            <!--</div>-->
-        </div>
-
-
         <!--购买原材料的弹窗-->
         <el-dialog
             :title="StagingName + '原材料购买'"
@@ -2122,18 +1662,18 @@ export default {
 
     },
     watch:{
-        'A1Obj.inventory'(newName,oldName){
-            console.log(newName,oldName)
-            // const dom = document.getElementById('donghuaA1')
-            // dom.innerHTML = '+1'
-            // dom.className = 'donghuajiayi'
-            // dom.style.background = this.A1Obj.color
-            // setTimeout(()=>{
-            //     dom.innerHTML = ''
-            //     dom.className = ''
-            //     dom.style.background = ''
-            // },1000)
-        }
+        // 'A1Obj.inventory'(newName,oldName){
+        //     console.log(newName,oldName)
+        //     // const dom = document.getElementById('donghuaA1')
+        //     // dom.innerHTML = '+1'
+        //     // dom.className = 'donghuajiayi'
+        //     // dom.style.background = this.A1Obj.color
+        //     // setTimeout(()=>{
+        //     //     dom.innerHTML = ''
+        //     //     dom.className = ''
+        //     //     dom.style.background = ''
+        //     // },1000)
+        // }
     },
     mounted() {
         // this.canvasfun()
@@ -2976,8 +2516,16 @@ export default {
 .staffBox {
     flex: 1;
     margin-bottom: 25px;
+    margin-left: 20px;
+    position: relative;
 //margin-bottom: 10px;
 }
+.zhunbedate {
+    position: absolute;
+    left: -35px;
+    top: 50%;
+    transform: translateY(-50%);
+}
 .staffBoxflex {
     display: flex;
     justify-content: space-between;
@@ -2985,6 +2533,7 @@ export default {
 .staffBoxren {
     width: 70px;
     position: relative;
+    margin: 0 5px;
 //transform: scale(0.8);
 }
 .staffBoxtext {

src/views/tirePartsMall/financialManagement/collectionSettlement/detailsPage.vue

@@ -23,7 +23,26 @@
     </div>
     <div style="margin-top: 50px">
       <trade-card title="基础信息">
-        <avue-form :option="optionForm" v-model="form" ref="form"></avue-form>
+        <avue-form :option="optionForm" v-model="form" ref="form">
+            <template slot-scope="scope" slot="corpId">
+                <el-select v-model="form.corpId" placeholder="请选择">
+                    <el-option
+                        v-for="item in corpIdData"
+                        :key="item.id"
+                        :label="item.cname"
+                        :value="item.id">
+                    </el-option>
+                </el-select>
+            </template>
+            <!--<template slot-scope="scope" slot="settlementDate">-->
+            <!--    <el-date-picker-->
+            <!--        v-model="value1"-->
+            <!--        type="date"-->
+            <!--        format="yyyy-MM-dd",-->
+            <!--        placeholder="选择日期">-->
+            <!--    </el-date-picker>-->
+            <!--</template>-->
+        </avue-form>
       </trade-card>
       <trade-card title="明细信息">
         <avue-crud :option="optionContacts" v-model="formContacts" ref="formContacts" :data="form.settlementItemsList"
@@ -49,6 +68,11 @@
           </template>
         </avue-crud>
       </trade-card>
+
+        <containerTitle title="上传附件"></containerTitle>
+        <c-upload v-loading="loadingBtn" typeUpload="LT"
+                  deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId" :data="filesList" display
+                  :enumerationValue="35.1"></c-upload>
     </div>
     <el-dialog title="导入订单" v-if="billDetailDialog" append-to-body class="el-dialogDeep" :visible.sync="billDetailDialog"
       width="80%" :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" top="10vh"
@@ -64,6 +88,7 @@
 import billDetail from "@/components/bill/selectOrderDetailList";
 import { saveSubmit, collectionAndPayment, revokeCollectionAndPayment, detail, removeItems, remove } from '@/api/accountingManagement/index.js';
 import { getList } from "@/api/collectionSettlement/index.js";
+import {skgetKh} from "@/api/tirePartsMall/salesManagement/saleOrder";
 
 
 export default {
@@ -73,6 +98,12 @@ export default {
   },
   data() {
     return {
+        // 上传附件的需要参数
+        loadingBtn:false,
+        filesList:[],
+
+        corpIdData:[],
+
       disabled: false,
       editButton: false,
       isSaveBtn: false,
@@ -200,7 +231,7 @@ export default {
           //   label: '单据编号',
           //   prop: 'attn',
           //   cell: true
-          // }, 
+          // },
           {
             label: '合同号',
             prop: 'contractNumber',
@@ -269,15 +300,7 @@ export default {
     detailData: Object
   },
   async created() {
-    let thisAmountSum = 0
-    this.optionContacts = await this.getColumnData(this.getColumnName(267.1), this.optionContactsBack);
-    this.findObject(this.optionContacts.column, "thisAmount").change = ({ value, column }) => {
-      thisAmountSum = 0
-      for (let item of this.form.settlementItemsList) {
-        thisAmountSum += item.thisAmount;
-      }
-      this.form.amount = Number(thisAmountSum)
-    }
+
     //  获取今天的日期
     var today = new Date();
     var year = today.getFullYear();
@@ -303,6 +326,24 @@ export default {
       this.editButton = true
       // console.log(this.form.settlementDate = '2023-07-03');
     }
+
+    // 先处理时间在赋值哦 防止数据渲染不上页面
+      let thisAmountSum = 0
+      this.optionContacts = await this.getColumnData(this.getColumnName(267.1), this.optionContactsBack);
+      this.findObject(this.optionContacts.column, "thisAmount").change = ({ value, column }) => {
+          thisAmountSum = 0
+          for (let item of this.form.settlementItemsList) {
+              thisAmountSum += item.thisAmount;
+          }
+          this.form.amount = Number(thisAmountSum)
+      }
+
+    // 获取客户的数据
+      skgetKh().then(res=>{
+        console.log(res,330)
+          this.corpIdData = res.data.data
+    })
+    // this.corpIdData
   },
   methods: {
     rowDelBox(row, index) {
@@ -340,6 +381,7 @@ export default {
       })
       detail({ id: id }).then(res => {
         this.form = res.data.data
+          this.filesList = res.data.data.filesList
         // if (res.data.data.financeStatus == '已收款') {
         //   console.log('已收款');
         //   this.$set(this.optionForm, 'disabled', true)
@@ -407,7 +449,8 @@ export default {
             ...this.form,
             dc: 'd',
             billType: 'SK',
-            corpName: this.form.$corpId
+            corpName: this.form.$corpId,
+              filesList:this.filesList
           }
           const loading = this.$loading({
             lock: true,

src/views/tirePartsMall/financialManagement/paymentSettlement/detailsPage.vue

@@ -49,6 +49,12 @@
           </template>
         </avue-crud>
       </trade-card>
+
+        <containerTitle title="上传附件"></containerTitle>
+        <c-upload v-loading="loadingBtn" typeUpload="LT"
+                  deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId" :data="filesList" display
+                  :enumerationValue="35.1"></c-upload>
+
     </div>
     <el-dialog title="导入销售" append-to-body class="el-dialogDeep" :visible.sync="billDetailDialog" width="80%"
       :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" top="10vh" v-dialog-drag>
@@ -71,6 +77,10 @@ export default {
   },
   data() {
     return {
+        // 上传附件的需要参数
+        loadingBtn:false,
+        filesList:[],
+
       billDetailDialog: false,
       isSave: 0,
       isMenu: false,
@@ -191,7 +201,7 @@ export default {
           //   label: '单据编号',
           //   prop: 'attn',
           //   cell: true
-          // }, 
+          // },
           {
             label: '合同号',
             prop: 'contractNumber',
@@ -298,6 +308,7 @@ export default {
       })
       detail({ id: id }).then(res => {
         this.form = res.data.data
+          this.filesList = res.data.data.filesList
         loading.close();
       }).catch(() => {
         loading.close();
@@ -344,7 +355,8 @@ export default {
             ...this.form,
             dc: 'c',
             billType: 'FK',
-            corpName: this.form.$corpId
+            corpName: this.form.$corpId,
+              filesList:this.filesList
           }
           const loading = this.$loading({
             lock: true,

src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue

@@ -68,6 +68,12 @@
             </trade-card>
             <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="入库工单"
                 @onClose="onClose()"></report-dialog>
+
+            <containerTitle title="上传附件"></containerTitle>
+            <c-upload v-loading="loadingBtn" typeUpload="LT"
+                      deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId" :data="filesList" display
+                      :enumerationValue="35.1"></c-upload>
+
         </div>
         <el-dialog title="导入明细" append-to-body :visible.sync="excelBox" v-if="excelBox" width="555px"
             :close-on-click-modal="false" v-dialog-drag>
@@ -107,6 +113,10 @@ export default {
     name: "detailsPage",
     data() {
         return {
+            // 上传附件的需要参数
+            loadingBtn:false,
+            filesList:[],
+
             switchDialog: false,
             isEdit: false,
             values: '',
@@ -337,7 +347,7 @@ export default {
                 //         },
                 //         trigger: "blur"
                 //     }]
-                // }, 
+                // },
                 {
                     label: "实际数量",
                     prop: "sendNum",
@@ -810,7 +820,8 @@ export default {
                     this.form.customerName = this.form.$customerId
                     submit({
                         ...this.form,
-                        bizTypeName: "SHGD"
+                        bizTypeName: "SHGD",
+                        filesList:this.filesList
                     }).then(res => {
                         this.$message.success("保存成功");
                         this.refresh(res.data.data.id);
@@ -833,6 +844,7 @@ export default {
             if (!this.detailData.id) {
                 getDetails({ id: id }).then(res => {
                     this.form = res.data.data
+                    this.filesList = res.data.data.filesList
                     loading.close();
                 }).catch(() => {
                     loading.close();
@@ -840,6 +852,7 @@ export default {
             } else {
                 getDetails({ id: this.detailData.id }).then(res => {
                     this.form = res.data.data
+                    this.filesList = res.data.data.filesList
                     loading.close();
                 }).catch(() => {
                     loading.close();

src/views/tirePartsMall/salesManagement/inboundTask/index.vue

@@ -96,6 +96,27 @@ export default {
           width: 140,
           overHidden: true,
         }, {
+            label: '状态',
+            prop: "statusName",
+            searchOrder:2,
+            width: 100,
+            search: true,
+            type: 'select',
+            overHidden: true,
+            dicData: [{
+                label: '待处理',
+                value: '待处理'
+            }, {
+                label: '已派工',
+                value: '已派工'
+            }, {
+                label: '未完成',
+                value: '未完成'
+            }, {
+                label: '已完成',
+                value: '已完成'
+            }],
+        }, {
           label: '业务对象',
           prop: "customerName",
           search: true,
@@ -114,7 +135,7 @@ export default {
           //     width: 100,
           //     overHidden: true,
           // }
-          , 
+          ,
         //   {
         //   label: '业务来源',
         //   prop: "bsType",
@@ -160,7 +181,7 @@ export default {
             value: 'id'
           },
           dicUrl: '/api/blade-user/stockClerkList',
-        },  
+        },
         {
           label: '收货地址',
           prop: "recAddress",
@@ -190,27 +211,6 @@ export default {
           width: 100,
           overHidden: true,
         }, {
-          label: '状态',
-          prop: "statusName",
-          searchOrder:2,
-          width: 100,
-          search: true,
-          type: 'select',
-          overHidden: true,
-          dicData: [{
-            label: '待处理',
-            value: '待处理'
-          }, {
-            label: '已派工',
-            value: '已派工'
-          }, {
-            label: '未完成',
-            value: '未完成'
-          }, {
-            label: '已完成',
-            value: '已完成'
-          }]
-        }, {
           label: '备注',
           prop: "remarks",
           width: 200,
@@ -343,6 +343,7 @@ export default {
         current: page.currentPage,
         size: page.pageSize,
         bizTypeName: "SHRW",
+          statusName:'待处理',
         ...Object.assign(params, this.search),
         customerName : params.$customerName
       }

src/views/tirePartsMall/salesManagement/outboundTask/index.vue

@@ -96,6 +96,27 @@ export default {
           width: 140,
           overHidden: true,
         }, {
+            label: '状态',
+            prop: "statusName",
+            searchOrder:2,
+            width: 100,
+            search: true,
+            type: 'select',
+            overHidden: true,
+            dicData: [{
+                label: '待处理',
+                value: '待处理'
+            }, {
+                label: '已派工',
+                value: '已派工'
+            },{
+                label: '未完成',
+                value: '未完成'
+            }, {
+                label: '已完成',
+                value: '已完成'
+            }],
+        }, {
           label: '业务对象',
           prop: "customerName",
           search: true,
@@ -159,7 +180,7 @@ export default {
             value: 'id'
           },
           dicUrl: '/api/blade-user/stockClerkList',
-        },  
+        },
         {
           label: '收货地址',
           prop: "recAddress",
@@ -189,27 +210,6 @@ export default {
           width: 100,
           overHidden: true,
         }, {
-          label: '状态',
-          prop: "statusName",
-          searchOrder:2,
-          width: 100,
-          search: true,
-          type: 'select',
-          overHidden: true,
-          dicData: [{
-            label: '待处理',
-            value: '待处理'
-          }, {
-            label: '已派工',
-            value: '已派工'
-          },{
-            label: '未完成',
-            value: '未完成'
-          }, {
-            label: '已完成',
-            value: '已完成'
-          }]
-        }, {
           label: '备注',
           prop: "remarks",
           width: 200,
@@ -332,7 +332,7 @@ export default {
       });
     },
     searchChange(params, done) {
-      console.log(params);
+      console.log(params,335);
       done();
       this.onLoad(this.page, params)
     },
@@ -342,6 +342,7 @@ export default {
         current: page.currentPage,
         size: page.pageSize,
         bizTypeName: "FHRW",
+          statusName:'待处理',
         ...Object.assign(params, this.search),
         customerName : params.$customerName
       }

src/views/tirePartsMall/salesManagement/outboundWorkOrder/detailsPage.vue

@@ -60,6 +60,11 @@
           </el-tab-pane>
         </el-tabs>
       </trade-card>
+        <containerTitle title="上传附件"></containerTitle>
+        <c-upload v-loading="loadingBtn" typeUpload="LT"
+                  deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId" :data="filesList" display
+                  :enumerationValue="35.1"></c-upload>
+
       <report-dialog :switchDialog="switchDialog" :reportId="form.id" @onClose="onClose()"></report-dialog>
     </div>
   </div>
@@ -77,6 +82,10 @@ export default {
   name: "detailsPage",
   data() {
     return {
+        // 上传附件的需要参数
+        loadingBtn:false,
+        filesList:[],
+
       switchDialog: false,
       activeName: "sale_detail",
       editButton: true,
@@ -514,7 +523,8 @@ export default {
           // this.goodsName;
           submit({
             ...this.form,
-            bizTypeName: "FHGD"
+            bizTypeName: "FHGD",
+              filesList:this.filesList
           }).then(res => {
             this.$message.success("保存成功");
             this.refresh(res.data.data.id)
@@ -554,6 +564,7 @@ export default {
             this.isDisabled = true
           }
           this.form = res.data.data
+            this.filesList = res.data.data.filesList
           this.$nextTick(() => {
             this.$refs.formContacts.refreshTable()
           })
@@ -578,6 +589,7 @@ export default {
             this.isDisabled = true
           }
           this.form = res.data.data
+            this.filesList = res.data.data.filesList
           this.$nextTick(() => {
             this.$refs.formContacts.refreshTable()
           })

src/views/tirePartsMall/statisticAnalysis/customerTransactions/detailsInfo.vue

@@ -126,29 +126,49 @@
                     </avue-crud>
                 </el-tab-pane>
                 <el-tab-pane label="客户信息" name="third">
-                    <div style="display:flex;justify-content: flex-end;">
-                        <el-button size="mini">禁用</el-button>
-                        <el-button type="primary" size="mini">打印</el-button>
-                    </div>
+                    <!--<div style="display:flex;justify-content: flex-end;">-->
+                    <!--    <el-button size="mini">禁用</el-button>-->
+                    <!--    <el-button type="primary" size="mini">打印</el-button>-->
+                    <!--</div>-->
+                    <!--<el-row class="client_info">-->
+                    <!--    <el-col :span="4">客户名称</el-col>-->
+                    <!--    <el-col :span="4">{{ form.cname | nameFileter }}</el-col>-->
+                    <!--    <el-col :span="4">期初欠款</el-col>-->
+                    <!--    <el-col :span="4">{{ form.arrears | nameFileter }}</el-col>-->
+                    <!--    <el-col :span="4">电话</el-col>-->
+                    <!--    <el-col :span="4">{{ form.tel | nameFileter }}</el-col>-->
+                    <!--</el-row>-->
                     <el-row class="client_info">
-                        <el-col :span="4">客户名称</el-col>
+                        <el-col :span="2">名称</el-col>
                         <el-col :span="4">{{ form.cname | nameFileter }}</el-col>
-                        <el-col :span="4">期初欠款</el-col>
-                        <el-col :span="4">{{ form.arrears | nameFileter }}</el-col>
-                        <el-col :span="4">电话</el-col>
+                        <el-col :span="2">分类</el-col>
+                        <el-col :span="4">{{ form.corpsTypeName | nameFileter }}</el-col>
+                        <el-col :span="2">电话</el-col>
                         <el-col :span="4">{{ form.tel | nameFileter }}</el-col>
+                        <el-col :span="2">业务员</el-col>
+                        <el-col :span="4">{{ form.salesmanName | nameFileter }}</el-col>
                     </el-row>
+                    <!--<el-row class="client_info">-->
+                    <!--    <el-col :span="4">备用电话</el-col>-->
+                    <!--    <el-col :span="4">{{ form.telephone | nameFileter }}</el-col>-->
+                    <!--    <el-col :span="4">传真</el-col>-->
+                    <!--    <el-col :span="4">{{ form.fax | nameFileter }}</el-col>-->
+                    <!--    <el-col :span="4">邮箱</el-col>-->
+                    <!--    <el-col :span="4">{{ form.mailbox | nameFileter }}</el-col>-->
+                    <!--</el-row>-->
                     <el-row class="client_info">
-                        <el-col :span="4">备用电话</el-col>
-                        <el-col :span="4">{{ form.telephone | nameFileter }}</el-col>
-                        <el-col :span="4">传真</el-col>
-                        <el-col :span="4">{{ form.fax | nameFileter }}</el-col>
-                        <el-col :span="4">邮箱</el-col>
-                        <el-col :span="4">{{ form.mailbox | nameFileter }}</el-col>
+                        <el-col :span="2">账期</el-col>
+                        <el-col :span="4">{{ form.accountPeriod | nameFileter }}</el-col>
+                        <el-col :span="2">发货仓库</el-col>
+                        <el-col :span="4">{{ form.deliveryWarehouseName | nameFileter }}</el-col>
+                        <el-col :span="2">商品价格</el-col>
+                        <el-col :span="4">{{ form.priceSystem | nameFileter }}</el-col>
+                        <el-col :span="2">信用额度</el-col>
+                        <el-col :span="4">{{ form.creditLimit | nameFileter }}</el-col>
                     </el-row>
                     <el-row class="client_info">
-                        <el-col :span="4">备注</el-col>
-                        <el-col :span="20">{{ form.remarks | nameFileter }}</el-col>
+                        <el-col :span="2">备注</el-col>
+                        <el-col :span="22">{{ form.remarks | nameFileter }}</el-col>
                     </el-row>
                     <el-row class="client_info" v-for="(item, index) in corpsAddrList" :key="index">
                         <el-col :span="2"><i class="el-icon-location"></i></el-col>
@@ -163,8 +183,8 @@
 
 <script>
 import { optionList, sellOption, capitalOption } from "./js/optionList";
-import { 
-    // getList, 
+import {
+    // getList,
     getCorpsAll, gainUser, getCorpType, getAllgoods } from "@/api/basicData/salesOrder";
 import { getList,getKh,getSk,topList,getZd} from "@/api/tirePartsMall/salesManagement/saleOrder";
 import { pageStatistics, remove, addCorpType, customerList } from "@/api/basicData/customerTransactions";
@@ -384,9 +404,9 @@ export default {
             // data.corpId = this.detailData.id;
             this.loading = true;
             console.log(data);
-            //id: id, status: '待确认,待发货,已发货,退款请核', bsType: 'XS' 
+            //id: id, status: '待确认,待发货,已发货,退款请核', bsType: 'XS'
             data.status = '待确认,待发货,已发货,退款请核'
-            
+
             // this.search.storageId = this.search.storageName
             // this.search.createId = this.search.createUser
             // delete this.search.storageName
@@ -415,9 +435,9 @@ export default {
             data.corpId = this.detailData.id;
             data.accountId = data.accountName
             data.salesCompanyId = data.salesCompanyName
-            delete data.corpName 
+            delete data.corpName
             delete data.accountName
-            delete data.salesCompanyName 
+            delete data.salesCompanyName
             this.loading = true;
             params = {
                 current: page.currentPage,

src/views/tirePartsMall/statisticAnalysis/customerTransactions/js/optionList.js

@@ -37,7 +37,7 @@ export const option = {
         value: 'id'
       },
       dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH&cname={{key}}',
-    }, 
+    },
     // {
     //   label: "电话",
     //   prop: "tel",
@@ -51,7 +51,7 @@ export const option = {
       overHidden: true
     },
     {
-      label: "实际数量",
+      label: "数量",
       prop: "number",
       overHidden: true,
     },

src/views/tirePartsMall/statisticAnalysis/supplierTransactions/detailsInfo.vue

@@ -126,25 +126,30 @@
                     </avue-crud>
                 </el-tab-pane>
                 <el-tab-pane label="供应商信息" name="third">
-                    <div style="display:flex;justify-content: flex-end;">
-                        <el-button size="mini">禁用</el-button>
-                        <el-button type="primary" size="mini">打印</el-button>
-                    </div>
+                    <!--<div style="display:flex;justify-content: flex-end;">-->
+                    <!--    <el-button size="mini">禁用</el-button>-->
+                    <!--    <el-button type="primary" size="mini">打印</el-button>-->
+                    <!--</div>-->
                     <el-row class="client_info">
-                        <el-col :span="4">客户名称</el-col>
+                        <el-col :span="4">名称</el-col>
                         <el-col :span="4">{{ form.cname | nameFileter }}</el-col>
-                        <el-col :span="4">信用额度</el-col>
-                        <el-col :span="4">{{ form.arrears | nameFileter }}</el-col>
+                        <el-col :span="4">分类</el-col>
+                        <el-col :span="4">{{ form.corpsTypeName | nameFileter }}</el-col>
+                        <!--<el-col :span="4">信用额度</el-col>-->
+                        <!--<el-col :span="4">{{ form.arrears | nameFileter }}</el-col>-->
                         <el-col :span="4">电话</el-col>
                         <el-col :span="4">{{ form.tel | nameFileter }}</el-col>
                     </el-row>
                     <el-row class="client_info">
-                        <el-col :span="4">商城价格</el-col>
-                        <el-col :span="4">{{ form.telephone | nameFileter }}</el-col>
-                        <el-col :span="4">账期</el-col>
-                        <el-col :span="4">{{ form.fax | nameFileter }}</el-col>
-                        <el-col :span="4">邮箱</el-col>
-                        <el-col :span="4">{{ form.mailbox | nameFileter }}</el-col>
+                        <!--salesmanName-->
+                        <!--<el-col :span="4">商城价格</el-col>-->
+                        <!--<el-col :span="4">{{ form.telephone | nameFileter }}</el-col>-->
+                        <el-col :span="4">业务员</el-col>
+                        <el-col :span="4">{{ form.salesmanName | nameFileter }}</el-col>
+                        <!--<el-col :span="4">账期</el-col>-->
+                        <!--<el-col :span="4">{{ form.fax | nameFileter }}</el-col>-->
+                        <!--<el-col :span="4">邮箱</el-col>-->
+                        <!--<el-col :span="4">{{ form.mailbox | nameFileter }}</el-col>-->
                     </el-row>
                     <el-row class="client_info">
                         <el-col :span="4">备注</el-col>
@@ -375,7 +380,7 @@ export default {
             // data.corpId = this.detailData.id;
             this.loading = true;
             console.log(data);
-            //id: id, status: '待确认,待发货,已发货,退款请核', bsType: 'XS' 
+            //id: id, status: '待确认,待发货,已发货,退款请核', bsType: 'XS'
             data.status = '待确认,待发货,已发货,退款请核'
             getList({ id: this.detailData.id, status: '待确认,待发货,已发货,退款请核', bsType: 'CG',...data,current:page.currentPage,
             size:page.pageSize })

src/views/tirePartsMall/statisticAnalysis/supplierTransactions/js/optionList.js

@@ -23,7 +23,7 @@ export const option = {
       overHidden: true
     },
     {
-      label: "客户名称",
+      label: "供应商名称",
       prop: "customerId",
       type: 'select',
       remote: true,
@@ -49,7 +49,7 @@ export const option = {
       overHidden: true
     },
     {
-      label: "实际数量",
+      label: "数量",
       prop: "number",
       overHidden: true,
     },
@@ -194,7 +194,7 @@ export const option2 = {
         trigger: "blur"
       }
     ]
-  }, 
+  },
   {
     label: "地址",
     prop: "belongtoarea",
@@ -215,7 +215,7 @@ export const option2 = {
     ],
     filterable: true,
     cell: true,
-  }, 
+  },
   {
     label: '详细地址',
     prop: 'detailedAddress',
@@ -438,7 +438,7 @@ export const sellOption = {
     //   label: '应结日期',
     //   prop: "dueDate",
     //   overHidden: true,
-    // }, 
+    // },
     {
       label: "制单人",
       prop: "createUserName",
@@ -526,7 +526,6 @@ export const capitalOption = {
       search: true,
       overHidden: true,
       type: 'select',
-      type:'select',
       props: {
         label: 'cname',
         value: 'id',
@@ -551,7 +550,7 @@ export const capitalOption = {
         value: "id"
       },
       dicUrl: "/api/blade-user/client/gainUser",
-    }, 
+    },
   ]
 }