【修改】调整家用工程订单，工程信息单

src/views/supply/engin/components/engin_form.vue

@@ -240,7 +240,7 @@
         <el-table-column align="center" label="税率" prop="taxRate" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="操作" width="100" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text" @click="deleteItem(scope.$index)" :disabled="scope.row.cantDel">删除</el-button>
+            <el-button type="text" @click="deleteItem(scope.$index)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/supply/engin/components/home_detail.vue

@@ -66,6 +66,10 @@
               <div class="value">{{detailData.saleTypeName}}</div>
             </el-col>
             <el-col :span="8" class="item">
+              <div class="label">第几次申报</div>
+              <div class="value">{{detailData.refDeclareNo}}</div>
+            </el-col>
+            <el-col :span="8" class="item">
               <div class="label">联系人</div>
               <div class="value">{{detailData.refLinkman}}</div>
             </el-col>
@@ -77,11 +81,15 @@
               <div class="label">移动电话</div>
               <div class="value">{{detailData.refPhone}}</div>
             </el-col>
-            <el-col :span="24" class="item">
+            <el-col :span="16" class="item">
               <div class="label">安装地址</div>
               <div class="value">{{detailData.refInstallAddress}}</div>
             </el-col>
             <el-col :span="8" class="item">
+              <div class="label">保证函</div>
+              <div class="value">{{detailData.refPromiseProvide}}</div>
+            </el-col>
+            <el-col :span="8" class="item">
               <div class="label">不扣押金</div>
               <div class="value">{{detailData.takeDeposit ? '是':'否'}}</div>
             </el-col>
@@ -113,14 +121,10 @@
                 <el-button type="text" @click="saveRemark">保存备注</el-button>
               </div>
             </el-col>
-            <el-col :span="16" class="item">
+            <el-col :span="24" class="item">
               <div class="label">备注</div>
               <div class="value">{{detailData.remark}}</div>
             </el-col>
-            <el-col :span="8" class="item">
-              <div class="label">第几次申报</div>
-              <div class="value">{{detailData.refDeclareNo}}</div>
-            </el-col>
             <el-col :span="6" class="item">
               <div class="label">制单人</div>
               <div class="value">{{detailData.createBy}}</div>

src/views/supply/engin/components/home_examine.vue

@@ -75,6 +75,12 @@
           </div>
         </el-col>
         <el-col :span="8" class="item">
+          <div class="label">第几次申报</div>
+          <div class="value">
+            <el-input v-model="detailData.refDeclareNo" placeholder="请输入第几次申报"></el-input>
+          </div>
+        </el-col>
+        <el-col :span="8" class="item">
           <div class="label">联系人</div>
           <div class="value">
             <el-input v-model="detailData.refLinkman" placeholder="请输入联系人"></el-input>
@@ -92,13 +98,22 @@
             <el-input v-model="detailData.refPhone" placeholder="请输入移动电话"></el-input>
           </div>
         </el-col>
-        <el-col :span="24" class="item">
+        <el-col :span="16" class="item">
           <div class="label">安装地址</div>
           <div class="value">
             <el-input v-model="detailData.refInstallAddress" placeholder="请输入安装地址"></el-input>
           </div>
         </el-col>
         <el-col :span="8" class="item">
+          <div class="label">保证函</div>
+          <div class="value">
+            <el-select v-model="detailData.refPromiseProvide" placeholder="选择保证函状态" size="small" clearable style="width: 100%">
+              <el-option label="未保证" value="未保证"></el-option>
+              <el-option label="已保证" value="已保证"></el-option>
+            </el-select>
+          </div>
+        </el-col>
+        <el-col :span="8" class="item">
           <div class="label">不扣押金</div>
           <div class="value">
             <!-- {{detailData.takeDeposit ? '是':'否'}} -->
@@ -154,18 +169,12 @@
             <el-input v-model="detailData.geLiInerNote" placeholder="请输入格力内部备注"></el-input>
           </div>
         </el-col>
-        <el-col :span="16" class="item">
+        <el-col :span="24" class="item">
           <div class="label">备注</div>
           <div class="value">
             <el-input v-model="detailData.remark" placeholder="请输入备注"></el-input>
           </div>
         </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">第几次申报</div>
-          <div class="value">
-            <el-input v-model="detailData.refDeclareNo" placeholder="请输入第几次申报"></el-input>
-          </div>
-        </el-col>
         <el-col :span="6" class="item">
           <div class="label">制单人</div>
           <div class="value">{{detailData.createBy}}</div>
@@ -207,23 +216,40 @@
         <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip></el-table-column>
-        <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <!-- {{ (scope.row.qty*100 - scope.row.directTransferQty*100 - scope.row.retiredQty*100) / 100 }} -->
+            <el-input v-model="scope.row.qty" size="small" type="number"></el-input>
+          </template>
+        </el-table-column>
         <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <!-- {{ scope.row.price | numToFixed }} -->
             <el-input v-model="scope.row.price" size="small" type="number"></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="right" label="工程登录数量" prop="enginNum" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
+        <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <!-- {{ (scope.row.qty*100 - scope.row.directTransferQty*100 - scope.row.retiredQty*100) / 100 }} -->
-            <el-input v-model="scope.row.qty" size="small" type="number"></el-input>
+            {{ scope.row.totalAmount | numToFixed }}
           </template>
         </el-table-column>
-        <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
+        <el-table-column align="right" label="工程登录数量" prop="enginNum" min-width="100" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column align="left" label="现金钱包" prop="customerWalletName" min-width="140" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.totalAmount | numToFixed }}
+            {{ scope.row.payAmount | numToFixed }}
+          </template>
+        </el-table-column> -->
+        <el-table-column align="left" label="现金钱包" prop="customerWalletId" min-width="160" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.customerWalletId" placeholder="选择现金钱包" size="small" clearable @change="changeXjWallet(scope.$index)">
+              <el-option
+                v-for="item in scope.row.wallets"
+                :key="item.customerWalletId"
+                :label="item.customerWalletName"
+                :value="item.customerWalletId">
+              </el-option>
+            </el-select>
           </template>
         </el-table-column>
         <!-- <el-table-column align="center" label="返利类型" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>
@@ -254,24 +280,6 @@
             {{ scope.row.discAmount | numToFixed }}
           </template>
         </el-table-column>
-        <!-- <el-table-column align="left" label="现金钱包" prop="customerWalletName" min-width="140" show-overflow-tooltip></el-table-column>
-        <el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.payAmount | numToFixed }}
-          </template>
-        </el-table-column> -->
-        <el-table-column align="left" label="现金钱包" prop="customerWalletId" min-width="160" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <el-select v-model="scope.row.customerWalletId" placeholder="选择现金钱包" size="small" clearable @change="changeXjWallet(scope.$index)">
-              <el-option
-                v-for="item in scope.row.wallets"
-                :key="item.customerWalletId"
-                :label="item.customerWalletName"
-                :value="item.customerWalletId">
-              </el-option>
-            </el-select>
-          </template>
-        </el-table-column>
         <el-table-column align="right" label="实付金额" prop="qty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{(((scope.row.price * scope.row.qty) * 100 - ((scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100) * 100 - ((scope.row.qty * (scope.row.discAmount * 100)) / 100) * 100) / 100)  | numToFixed}}
@@ -286,6 +294,7 @@
         <el-table-column align="right" label="已发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
       </el-table>
     </div>
 

src/views/supply/engin/components/home_form.vue

@@ -114,24 +114,32 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="联系人" prop="contactMan">
-            <el-input v-model="mainForm.contactMan" placeholder="请输入联系人" :disabled="isDealer"></el-input>
+            <el-input v-model="mainForm.contactMan" placeholder="请输入联系人"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="固定电话" prop="tel">
-            <el-input v-model="mainForm.tel" placeholder="请输入固定电话" :disabled="isDealer"></el-input>
+            <el-input v-model="mainForm.tel" placeholder="请输入固定电话"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="移动电话" prop="phone">
-            <el-input v-model="mainForm.phone" placeholder="请输入移动电话" :disabled="isDealer"></el-input>
+            <el-input v-model="mainForm.phone" placeholder="请输入移动电话"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="24" :lg="24">
+        <el-col :xs="24" :sm="16" :lg="16">
           <el-form-item label="安装地址" prop="address">
             <el-input v-model="mainForm.address" placeholder="请输入安装地址" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
+        <el-col :xs="24" :sm="8" :lg="8">
+          <el-form-item label="保证函" prop="refPromiseProvide">
+            <el-select v-model="mainForm.refPromiseProvide" placeholder="选择保证函状态" size="small" clearable style="width: 100%">
+              <el-option label="未保证" value="未保证"></el-option>
+              <el-option label="已保证" value="已保证"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :xs="24" :sm="24" :lg="24">
           <el-form-item label="项目说明" prop="projectRemark">
             <el-input v-model="mainForm.projectRemark" placeholder="请输入项目说明" :disabled="isDealer"></el-input>
@@ -527,6 +535,7 @@ export default {
         regionWork: '',
         examineStatus: '',
         refBuyUnitName: '',
+        refPromiseProvide: '',
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -904,6 +913,7 @@ export default {
         this.mainForm.regionWork = data.refRegionWork;
         this.mainForm.examineStatus = data.examineStatus;
         this.mainForm.refBuyUnitName = data.refBuyUnitName;
+        this.mainForm.refPromiseProvide = data.refPromiseProvide;
 
         data.items.forEach(item => {
           item.status1 = '';
@@ -1164,6 +1174,7 @@ export default {
             refProjectType: this.mainForm.projectType,
             refRegionWork: this.mainForm.regionWork,
             refBuyUnitName: this.mainForm.refBuyUnitName,
+            refPromiseProvide: this.mainForm.refPromiseProvide,
             items: goodsList,
           }
 
@@ -1220,6 +1231,7 @@ export default {
       this.mainForm.refCount = data.refCount;
       this.mainForm.regionWork = data.regionWork;
       this.mainForm.refBuyUnitName = data.buyUnitName;
+      this.mainForm.refPromiseProvide = data.promiseProvide === 1 ? '已保证':'未保证';
 
       let saleTypeItem = this.salesTypeList.find(o => o.id === this.mainForm.saleType);
 

src/views/supply/engin/components/home_return.vue

@@ -49,6 +49,10 @@
           <div class="value">{{detailData.refUseUnit}}</div>
         </el-col>
         <el-col :span="8" class="item">
+          <div class="label">购买单位</div>
+          <div class="value">{{detailData.refBuyUnitName}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
           <div class="label">区域</div>
           <div class="value">{{detailData.refRegionWork}}</div>
         </el-col>
@@ -57,6 +61,10 @@
           <div class="value">{{detailData.saleTypeName}}</div>
         </el-col>
         <el-col :span="8" class="item">
+          <div class="label">第几次申报</div>
+          <div class="value">{{detailData.refDeclareNo}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
           <div class="label">联系人</div>
           <div class="value">{{detailData.refLinkman}}</div>
         </el-col>
@@ -68,6 +76,14 @@
           <div class="label">移动电话</div>
           <div class="value">{{detailData.refPhone}}</div>
         </el-col>
+        <el-col :span="16" class="item">
+          <div class="label">安装地址</div>
+          <div class="value">{{detailData.refInstallAddress}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">保证函</div>
+          <div class="value">{{detailData.refPromiseProvide}}</div>
+        </el-col>
         <el-col :span="8" class="item">
           <div class="label">不扣押金</div>
           <div class="value">{{detailData.takeDeposit ? '是':'否'}}</div>
@@ -101,14 +117,10 @@
           <div class="label">格力内部备注</div>
           <div class="value">{{detailData.geLiInerNote}}</div>
         </el-col>
-        <el-col :span="16" class="item">
+        <el-col :span="24" class="item">
           <div class="label">备注</div>
           <div class="value">{{detailData.remark}}</div>
         </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">第几次申报</div>
-          <div class="value">{{detailData.refDeclareNo}}</div>
-        </el-col>
         <el-col :span="6" class="item">
           <div class="label">制单人</div>
           <div class="value">{{detailData.createBy}}</div>

src/views/supply/engin/home_list.vue

@@ -168,12 +168,15 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="工程登录编号" prop="refEnginRecordNo" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refEnginRecordNo" />
                 <span>{{scope.row.refEnginRecordNo}}</span>
               </template>
             </el-table-column>
+            <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="保证函" prop="refPromiseProvide" min-width="100" show-overflow-tooltip></el-table-column>
             
             <el-table-column align="left" label="跨区厂编号" prop="refFactoryNo" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip></el-table-column>
@@ -202,18 +205,36 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="总数量" prop="qty" min-width="100" sortable show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="单价" prop="price" min-width="100" sortable show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.price | numToFixed}}
               </template>
             </el-table-column>
+            <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="110" sortable show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.totalAmount | numToFixed}}
+              </template>
+            </el-table-column>
             <el-table-column align="right" label="实付金额" prop="payAmount" min-width="110" sortable show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.payAmount | numToFixed}}
               </template>
             </el-table-column>
+
+            <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.customerNumber" />
+                <span>{{ scope.row.customerNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.customerName" />
+                <span>{{ scope.row.customerName }}</span>
+              </template>
+            </el-table-column>
+
             <el-table-column align="left" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.isDirectTransfer ? '是':'否'}}
@@ -241,7 +262,6 @@
             <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="表头业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="表体业务员" prop="itemServiceName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核人" prop="confirmBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核日期" prop="confirmTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="订单类型" prop="enginOrderType" min-width="100" show-overflow-tooltip>
@@ -249,7 +269,7 @@
                 {{scope.row.enginOrderType | typeFilter}}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="220" fixed="right">
               <template slot-scope="scope">
                 <el-popconfirm
@@ -513,7 +533,7 @@ export default {
       getOrderList(params).then((res) => {
         res.data.records.forEach(item => {
           item.sums1 = ['qty', 'directTransferQty', 'hasSendQty'];
-          item.sums2 = ['price', 'payAmount', 'discAmount'];
+          item.sums2 = ['price', 'totalAmount', 'payAmount', 'discAmount'];
         })
         this.dataList = res.data.records;
         this.listTotal = res.data.total;

src/views/supply/implement/implement_total_list.vue

@@ -49,7 +49,7 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="存货类别" prop="k3CategoryNumber">
-                <el-select v-model="screenForm.k3CategoryNumber" filterable clearable placeholder="请选择">
+                <el-select v-model="screenForm.k3CategoryNumber" filterable clearable multiple collapse-tags placeholder="请选择">
                   <el-option
                     v-for="item in categoryList"
                     :key="item.id"
@@ -153,6 +153,7 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="存货类别" prop="k3CategoryName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialCode" />
@@ -270,7 +271,7 @@ export default {
         newServiceName: '',
         enginName: '',
         loginNum: '',
-        k3CategoryNumber: '',
+        k3CategoryNumber: [],
         policyCode: '',
         policyRemark: '',
         isOver: '',
@@ -301,7 +302,7 @@ export default {
         itemServiceName: this.screenForm.itemServiceName,
         projectName: this.screenForm.enginName,
         enginRecordNo: this.screenForm.orderNum,
-        k3CategoryNumber: this.screenForm.k3CategoryNumber,
+        k3CategoryNumber: this.screenForm.k3CategoryNumber.join(','),
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
         isOver: this.screenForm.isOver,
@@ -339,7 +340,7 @@ export default {
         itemServiceName: this.screenForm.itemServiceName,
         projectName: this.screenForm.enginName,
         enginRecordNo: this.screenForm.orderNum,
-        k3CategoryNumber: this.screenForm.k3CategoryNumber,
+        k3CategoryNumber: this.screenForm.k3CategoryNumber.join(','),
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
         isOver: this.screenForm.isOver,